Bump to 1.0.3

Move 1.11.1 support to new class, fixes any other support issues (or just upgrade bungee etc)
Fix #587
2016-12-20 21:06:23 +00:00 · 2016-12-20 20:54:28 +00:00 · 2016-12-20 20:13:19 +00:00 · 2016-12-20 20:11:21 +00:00 · 2016-12-20 16:14:13 +00:00
11 changed files with 47 additions and 22 deletions
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>viaversion-parent</artifactId>
        <groupId>us.myles</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -37,16 +37,19 @@ public class DeathListener extends ViaBukkitListener {
        Via.getPlatform().runSync(new Runnable() {
            @Override
            public void run() {
-                PacketWrapper wrapper = new PacketWrapper(0x2C, null, getUserConnection(p));
-                try {
-                    wrapper.write(Type.VAR_INT, 2); // Event - Entity dead
-                    wrapper.write(Type.VAR_INT, p.getEntityId()); // Player ID
-                    wrapper.write(Type.INT, p.getEntityId()); // Entity ID
-                    Protocol1_9TO1_8.FIX_JSON.write(wrapper, msg); // Message
+                // If online
+                if(getUserConnection(p) != null) {
+                    PacketWrapper wrapper = new PacketWrapper(0x2C, null, getUserConnection(p));
+                    try {
+                        wrapper.write(Type.VAR_INT, 2); // Event - Entity dead
+                        wrapper.write(Type.VAR_INT, p.getEntityId()); // Player ID
+                        wrapper.write(Type.INT, p.getEntityId()); // Entity ID
+                        Protocol1_9TO1_8.FIX_JSON.write(wrapper, msg); // Message

-                    wrapper.send(Protocol1_9TO1_8.class);
-                } catch (Exception e) {
-                    e.printStackTrace();
+                        wrapper.send(Protocol1_9TO1_8.class);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                }
            }
        });
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>viaversion-parent</artifactId>
        <groupId>us.myles</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -37,7 +37,7 @@
        <dependency>
            <groupId>us.myles</groupId>
            <artifactId>viaversion-common</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3</version>
        </dependency>
    </dependencies>
 </project>
@@ -29,16 +29,20 @@ public class MainHandPatch implements Listener {
    @EventHandler
    public void onServerConnect(ServerConnectEvent event) {
        // Ignore if it doesn't exist (Like BungeeCord 1.8)
-        if (setMainHand == null)
+        if (setMainHand == null || getSettings == null)
            return;

        UserConnection user = Via.getManager().getConnection(event.getPlayer().getUniqueId());
-        if(user == null) return;
-        
+        if (user == null) return;
+
        try {
            if (user.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) {
                Object settings = getSettings.invoke(event.getPlayer());
-                setMainHand.invoke(settings, user.get(EntityTracker.class).getMainHand());
+                if (settings != null) {
+                    if (user.has(EntityTracker.class)) {
+                        setMainHand.invoke(settings, user.get(EntityTracker.class).getMainHand());
+                    }
+                }
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>viaversion-parent</artifactId>
        <groupId>us.myles</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -6,6 +6,7 @@ import us.myles.ViaVersion.api.Pair;
 import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.protocols.base.BaseProtocol;
 import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4;
+import us.myles.ViaVersion.protocols.protocol1_11_1to1_11.Protocol1_11_1To1_11;
 import us.myles.ViaVersion.protocols.protocol1_11to1_10.Protocol1_11To1_10;
 import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2TO1_9_3_4;
 import us.myles.ViaVersion.protocols.protocol1_9_1to1_9.Protocol1_9_1TO1_9;
@@ -37,7 +38,8 @@ public class ProtocolRegistry {
        registerProtocol(new Protocol1_9_1_2TO1_9_3_4(), Arrays.asList(ProtocolVersion.v1_9_1.getId(), ProtocolVersion.v1_9_2.getId()), ProtocolVersion.v1_9_3.getId());
        registerProtocol(new Protocol1_10To1_9_3_4(), Collections.singletonList(ProtocolVersion.v1_10.getId()), ProtocolVersion.v1_9_3.getId());

-        registerProtocol(new Protocol1_11To1_10(), Arrays.asList(ProtocolVersion.v1_11.getId(), ProtocolVersion.v1_11_1.getId()), ProtocolVersion.v1_10.getId());
+        registerProtocol(new Protocol1_11To1_10(), Arrays.asList(ProtocolVersion.v1_11.getId()), ProtocolVersion.v1_10.getId());
+        registerProtocol(new Protocol1_11_1To1_11(), Arrays.asList(ProtocolVersion.v1_11_1.getId()), ProtocolVersion.v1_11.getId());

    }

@@ -0,0 +1,16 @@
+package us.myles.ViaVersion.protocols.protocol1_11_1to1_11;
+
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.Protocol;
+
+public class Protocol1_11_1To1_11 extends Protocol {
+    @Override
+    protected void registerPackets() {
+        // Only had metadata changes, see wiki.vg for full info.
+    }
+
+    @Override
+    public void init(UserConnection userConnection) {
+
+    }
+}
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>viaversion-parent</artifactId>
        <groupId>us.myles</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <name>viaversion-jar</name>
@@ -6,7 +6,7 @@

    <groupId>us.myles</groupId>
    <artifactId>viaversion-parent</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
    <packaging>pom</packaging>

    <name>viaversion-parent</name>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>viaversion-parent</artifactId>
        <groupId>us.myles</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>viaversion-parent</artifactId>
        <groupId>us.myles</groupId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
Myles	c2578bd212	Bump to 1.0.3	2016-12-20 21:06:23 +00:00
Myles	a1347dd669	Move 1.11.1 support to new class, fixes any other support issues (or just upgrade bungee etc)	2016-12-20 20:54:28 +00:00
Myles	3228ba65ae	Fix #587	2016-12-20 20:13:19 +00:00
Myles	08b2d5b7e8	Fix #604	2016-12-20 20:11:21 +00:00
Myles	2b89dbce0e	Back to snapshot	2016-12-20 16:14:13 +00:00