Fix a vanilla Minecraft bug involving clientside passengers

Only affects 1.9 and 1.10
DenizenScript · Sep 28, 2016 · d0ad1fb · d0ad1fb
1 parent 13557fc
commit d0ad1fb
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 29 deletions.
diff --git a/...java/net/aufdemrand/denizen/nms/impl/packets/handlers/DenizenNetworkManager_v1_10_R1.java b/...java/net/aufdemrand/denizen/nms/impl/packets/handlers/DenizenNetworkManager_v1_10_R1.java
@@ -91,16 +91,26 @@ else if (packet instanceof PacketPlayOutNamedEntitySpawn
             PacketOutSpawnEntity spawnEntity = new PacketOutSpawnEntity_v1_10_R1(player, packet);
             UUID uuid = spawnEntity.getEntityUuid();
             if (!NMSHandler.getInstance().getEntityHelper().isHidden(player.getBukkitEntity(), uuid)) {
-                Entity entity = ((WorldServer) player.getWorld()).getEntity(uuid);
-                if (entity instanceof EntityFakePlayer_v1_10_R1) {
-                    final EntityFakePlayer_v1_10_R1 fakePlayer = (EntityFakePlayer_v1_10_R1) entity;
-                    sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, fakePlayer));
-                    Bukkit.getScheduler().runTaskLater(NMSHandler.getJavaPlugin(), new Runnable() {
-                        @Override
-                        public void run() {
-                            sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, fakePlayer));
-                        }
-                    }, 5);
+                final Entity entity = ((WorldServer) player.getWorld()).getEntity(uuid);
+                if (entity != null) {
+                    if (entity instanceof EntityFakePlayer_v1_10_R1) {
+                        final EntityFakePlayer_v1_10_R1 fakePlayer = (EntityFakePlayer_v1_10_R1) entity;
+                        sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, fakePlayer));
+                        Bukkit.getScheduler().runTaskLater(NMSHandler.getJavaPlugin(), new Runnable() {
+                            @Override
+                            public void run() {
+                                sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, fakePlayer));
+                            }
+                        }, 5);
+                    }
+                    if (entity.isPassenger()) {
+                        Bukkit.getScheduler().runTaskLater(NMSHandler.getJavaPlugin(), new Runnable() {
+                            @Override
+                            public void run() {
+                                sendPacket(new PacketPlayOutMount(entity.getVehicle()));
+                            }
+                        }, 1);
+                    }
                 }
                 oldManager.sendPacket(packet);
             }

diff --git a/.../java/net/aufdemrand/denizen/nms/impl/packets/handlers/DenizenNetworkManager_v1_8_R3.java b/.../java/net/aufdemrand/denizen/nms/impl/packets/handlers/DenizenNetworkManager_v1_8_R3.java
@@ -92,15 +92,17 @@ else if (packet instanceof PacketPlayOutNamedEntitySpawn
             UUID uuid = spawnEntity.getEntityUuid();
             if (!NMSHandler.getInstance().getEntityHelper().isHidden(player.getBukkitEntity(), uuid)) {
                 Entity entity = ((WorldServer) player.getWorld()).getEntity(uuid);
-                if (entity instanceof EntityFakePlayer_v1_8_R3) {
-                    final EntityFakePlayer_v1_8_R3 fakePlayer = (EntityFakePlayer_v1_8_R3) entity;
-                    handle(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, fakePlayer));
-                    Bukkit.getScheduler().runTaskLater(NMSHandler.getJavaPlugin(), new Runnable() {
-                        @Override
-                        public void run() {
-                            handle(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, fakePlayer));
-                        }
-                    }, 5);
+                if (entity != null) {
+                    if (entity instanceof EntityFakePlayer_v1_8_R3) {
+                        final EntityFakePlayer_v1_8_R3 fakePlayer = (EntityFakePlayer_v1_8_R3) entity;
+                        handle(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, fakePlayer));
+                        Bukkit.getScheduler().runTaskLater(NMSHandler.getJavaPlugin(), new Runnable() {
+                            @Override
+                            public void run() {
+                                handle(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, fakePlayer));
+                            }
+                        }, 5);
+                    }
                 }
                 oldManager.handle(packet);
             }

diff --git a/.../java/net/aufdemrand/denizen/nms/impl/packets/handlers/DenizenNetworkManager_v1_9_R2.java b/.../java/net/aufdemrand/denizen/nms/impl/packets/handlers/DenizenNetworkManager_v1_9_R2.java
@@ -91,16 +91,26 @@ else if (packet instanceof PacketPlayOutNamedEntitySpawn
             PacketOutSpawnEntity spawnEntity = new PacketOutSpawnEntity_v1_9_R2(player, packet);
             UUID uuid = spawnEntity.getEntityUuid();
             if (!NMSHandler.getInstance().getEntityHelper().isHidden(player.getBukkitEntity(), uuid)) {
-                Entity entity = ((WorldServer) player.getWorld()).getEntity(uuid);
-                if (entity instanceof EntityFakePlayer_v1_9_R2) {
-                    final EntityFakePlayer_v1_9_R2 fakePlayer = (EntityFakePlayer_v1_9_R2) entity;
-                    sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, fakePlayer));
-                    Bukkit.getScheduler().runTaskLater(NMSHandler.getJavaPlugin(), new Runnable() {
-                        @Override
-                        public void run() {
-                            sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, fakePlayer));
-                        }
-                    }, 5);
+                final Entity entity = ((WorldServer) player.getWorld()).getEntity(uuid);
+                if (entity != null) {
+                    if (entity instanceof EntityFakePlayer_v1_9_R2) {
+                        final EntityFakePlayer_v1_9_R2 fakePlayer = (EntityFakePlayer_v1_9_R2) entity;
+                        sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, fakePlayer));
+                        Bukkit.getScheduler().runTaskLater(NMSHandler.getJavaPlugin(), new Runnable() {
+                            @Override
+                            public void run() {
+                                sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, fakePlayer));
+                            }
+                        }, 5);
+                    }
+                    if (entity.isPassenger()) {
+                        Bukkit.getScheduler().runTaskLater(NMSHandler.getJavaPlugin(), new Runnable() {
+                            @Override
+                            public void run() {
+                                sendPacket(new PacketPlayOutMount(entity.getVehicle()));
+                            }
+                        }, 1);
+                    }
                 }
                 oldManager.sendPacket(packet);
             }