From 3c76fde190f6ded160365250ce5ed5629b8597f4 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 26 Nov 2014 09:51:08 +1300 Subject: [PATCH] Ignore wither skulls for CustomTagFix --- .../src/mineplex/core/CustomTagFix.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java index 3dd26bc38..db9db0530 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java @@ -1,6 +1,7 @@ package mineplex.core; import java.lang.reflect.Field; +import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -22,6 +23,7 @@ import net.minecraft.server.v1_7_R4.Packet; import net.minecraft.server.v1_7_R4.PacketPlayOutAttachEntity; import net.minecraft.server.v1_7_R4.PacketPlayOutEntityDestroy; import net.minecraft.server.v1_7_R4.PacketPlayOutEntityMetadata; +import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntity; import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntityLiving; import net.minecraft.server.v1_7_R4.WatchableObject; @@ -38,6 +40,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler private NautHashMap> _entityNameMap = new NautHashMap>(); private NautHashMap> _entityVehicleMap = new NautHashMap>(); private NautHashMap _loggedIn = new NautHashMap(); + private HashSet _ignoreSkulls = new HashSet(); private Field _destroyId; @@ -149,7 +152,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler { PacketPlayOutEntityMetadata metaPacket = (PacketPlayOutEntityMetadata)packet; - if (!_entityMap.get(owner).containsKey(metaPacket.a) && metaPacket.a != 777777) + if (!_entityMap.get(owner).containsKey(metaPacket.a) && metaPacket.a != 777777 && !_ignoreSkulls.contains(metaPacket.a)) { String entityName = ""; boolean nameShowing = false; @@ -198,6 +201,14 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler { exception.printStackTrace(); } + } + else if (packet instanceof PacketPlayOutSpawnEntity) + { + PacketPlayOutSpawnEntity spawnPacket = (PacketPlayOutSpawnEntity) packet; + if (spawnPacket.j == 66 && spawnPacket.a != 777777) + { + _ignoreSkulls.add(spawnPacket.a); + } } /* else if (packet instanceof PacketPlayOutAttachEntity)