From 9f6ed73b6c6902406e783d108d64b19b5319111e Mon Sep 17 00:00:00 2001 From: TrueBrain Date: Tue, 10 Jul 2012 00:33:50 +0200 Subject: [PATCH] -Codechange: applied LexManos' request --- .../net/minecraft/src/forge/ForgeHooks.java | 7 ------- .../net/minecraft/src/EntityTrackerEntry.java.patch | 10 ++++++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index f623dc031..9261739f8 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -29,7 +29,6 @@ import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.World; import net.minecraft.src.mod_MinecraftForge; import net.minecraft.src.forge.packets.PacketEntitySpawn; -import net.minecraft.src.forge.packets.PacketEntityTrack; import net.minecraft.src.forge.packets.PacketHandlerBase; import java.io.ByteArrayOutputStream; @@ -711,12 +710,6 @@ public class ForgeHooks PacketEntitySpawn pkt = new PacketEntitySpawn(entity, info.Mod, info.ID); return pkt.getPacket(); } - - public static Packet getEntityTrackPacket(int entityId, int serverPosX, int serverPosY, int serverPosZ) - { - PacketEntityTrack pkt = new PacketEntityTrack(entityId, serverPosX, serverPosY, serverPosZ); - return pkt.getPacket(); - } public static Hashtable networkMods = new Hashtable(); public static Hashtable guiHandlers = new Hashtable(); diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityTrackerEntry.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityTrackerEntry.java.patch index 63b9ea0d6..73e95709a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityTrackerEntry.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityTrackerEntry.java.patch @@ -1,15 +1,16 @@ --- ../src_base/minecraft_server/net/minecraft/src/EntityTrackerEntry.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/EntityTrackerEntry.java 0000-00-00 00:00:00.000000000 -0000 -@@ -5,6 +5,8 @@ +@@ -5,6 +5,9 @@ import java.util.List; import java.util.Set; +import net.minecraft.src.forge.ForgeHooks; ++import net.minecraft.src.forge.packets.PacketEntityTrack; + public class EntityTrackerEntry { /** The entity that this EntityTrackerEntry tracks. */ -@@ -226,6 +228,14 @@ +@@ -226,6 +229,15 @@ this.trackedPlayers.add(par1EntityPlayerMP); par1EntityPlayerMP.playerNetServerHandler.sendPacket(this.getSpawnPacket()); @@ -18,13 +19,14 @@ + int posZ = MathHelper.floor_double(this.trackedEntity.posZ * 32.0D); + if (posX != this.encodedPosX || posY != this.encodedPosY || posZ != this.encodedPosZ) + { -+ par1EntityPlayerMP.playerNetServerHandler.sendPacket(ForgeHooks.getEntityTrackPacket(this.trackedEntity.entityId, this.encodedPosX, this.encodedPosY, this.encodedPosZ)); ++ PacketEntityTrack pkt = new PacketEntityTrack(this.trackedEntity.entityId, this.encodedPosX, this.encodedPosY, this.encodedPosZ); ++ par1EntityPlayerMP.playerNetServerHandler.sendPacket(pkt.getPacket()); + } + if (this.shouldSendMotionUpdates) { par1EntityPlayerMP.playerNetServerHandler.sendPacket(new Packet28EntityVelocity(this.trackedEntity.entityId, this.trackedEntity.motionX, this.trackedEntity.motionY, this.trackedEntity.motionZ)); -@@ -286,6 +296,11 @@ +@@ -286,6 +298,11 @@ { System.out.println("Fetching addPacket for removed entity"); }