--- ../src-base/minecraft/net/minecraft/entity/EntityTrackerEntry.java
+++ ../src-work/minecraft/net/minecraft/entity/EntityTrackerEntry.java
@@ -56,9 +56,15 @@
import net.minecraft.world.storage.MapData;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import net.minecraft.server.MinecraftServer; // Spigot
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
+// CraftBukkit start
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerVelocityEvent;
+// CraftBukkit end
+
public class EntityTrackerEntry
{
private static final Logger logger = LogManager.getLogger();
@@ -131,15 +137,15 @@
this.func_151259_a(new S1BPacketEntityAttach(0, this.myEntity, this.myEntity.ridingEntity));
}
- if (this.myEntity instanceof EntityItemFrame && this.ticks % 10 == 0)
+ if (this.myEntity instanceof EntityItemFrame /*&& this.ticks % 10 == 0*/) // CraftBukkit - Moved below, should always enter this block
{
EntityItemFrame entityitemframe = (EntityItemFrame)this.myEntity;
ItemStack itemstack = entityitemframe.getDisplayedItem();
- if (itemstack != null && itemstack.getItem() instanceof ItemMap)
+ if (this.ticks % 10 == 0 && itemstack != null && itemstack.getItem() instanceof ItemMap) // CraftBukkit - Moved this.m % 10 logic here so item frames do not enter the other blocks
{
MapData mapdata = Items.filled_map.getMapData(itemstack, this.myEntity.worldObj);
- Iterator iterator = p_73122_1_.iterator();
+ Iterator iterator = this.trackingPlayers.iterator(); // CraftBukkit
while (iterator.hasNext())
{
@@ -177,6 +183,22 @@
boolean flag = Math.abs(j1) >= 4 || Math.abs(k1) >= 4 || Math.abs(l1) >= 4 || this.ticks % 60 == 0;
boolean flag1 = Math.abs(l - this.lastYaw) >= 4 || Math.abs(i1 - this.lastPitch) >= 4;
+ // CraftBukkit start - Code moved from below
+ if (flag)
+ {
+ this.lastScaledXPosition = i;
+ this.lastScaledYPosition = j;
+ this.lastScaledZPosition = k;
+ }
+
+ if (flag1)
+ {
+ this.lastYaw = l;
+ this.lastPitch = i1;
+ }
+
+ // CraftBukkit end
+
if (this.ticks > 0 || this.myEntity instanceof EntityArrow)
{
if (j1 >= -128 && j1 < 128 && k1 >= -128 && k1 < 128 && l1 >= -128 && l1 < 128 && this.ticksSinceLastForcedTeleport <= 400 && !this.ridingEntity)
@@ -197,7 +219,15 @@
else
{
this.ticksSinceLastForcedTeleport = 0;
- object = new S18PacketEntityTeleport(this.myEntity.getEntityId(), i, j, k, (byte)l, (byte)i1);
+
+ // CraftBukkit start - Refresh list of who can see a player before sending teleport packet
+ if (this.myEntity instanceof EntityPlayerMP)
+ {
+ this.sendEventsToPlayers(new java.util.ArrayList(this.trackingPlayers));
+ }
+
+ // CraftBukkit end
+ object = new S18PacketEntityTeleport(this.myEntity.getEntityId(), i, j, k, (byte) l, (byte) i1);
}
}
@@ -224,7 +254,7 @@
}
this.sendMetadataToAllAssociatedPlayers();
-
+ /* CraftBukkit start - Code moved up
if (flag)
{
this.lastScaledXPosition = i;
@@ -237,7 +267,7 @@
this.lastYaw = l;
this.lastPitch = i1;
}
-
+ // CraftBukkit end */
this.ridingEntity = false;
}
else
@@ -275,7 +305,32 @@
if (this.myEntity.velocityChanged)
{
- this.func_151261_b(new S12PacketEntityVelocity(this.myEntity));
+ // CraftBukkit start - Create PlayerVelocity event
+ boolean cancelled = false;
+
+ if (this.myEntity instanceof EntityPlayerMP)
+ {
+ Player player = (Player) this.myEntity.getBukkitEntity();
+ org.bukkit.util.Vector velocity = player.getVelocity();
+ PlayerVelocityEvent event = new PlayerVelocityEvent(player, velocity);
+ this.myEntity.worldObj.getServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled())
+ {
+ cancelled = true;
+ }
+ else if (!velocity.equals(event.getVelocity()))
+ {
+ player.setVelocity(velocity);
+ }
+ }
+
+ if (!cancelled)
+ {
+ this.func_151261_b((Packet)(new S12PacketEntityVelocity(this.myEntity)));
+ }
+
+ // CraftBukkit end
this.myEntity.velocityChanged = false;
}
}
@@ -296,6 +351,13 @@
if (!set.isEmpty())
{
+ // CraftBukkit start - Send scaled max health
+ if (this.myEntity instanceof EntityPlayerMP)
+ {
+ ((EntityPlayerMP) this.myEntity).getBukkitEntity().injectScaledMaxHealth(set, false);
+ }
+
+ // CraftBukkit end
this.func_151261_b(new S20PacketEntityProperties(this.myEntity.getEntityId(), set));
}
@@ -353,6 +415,19 @@
if (d0 >= (double)(-this.blocksDistanceThreshold) && d0 <= (double)this.blocksDistanceThreshold && d1 >= (double)(-this.blocksDistanceThreshold) && d1 <= (double)this.blocksDistanceThreshold)
{
+ // CraftBukkit start
+ if (this.myEntity instanceof EntityPlayerMP)
+ {
+ Player player = ((EntityPlayerMP) this.myEntity).getBukkitEntity();
+
+ if (!p_73117_1_.getBukkitEntity().canSee(player))
+ {
+ return;
+ }
+ }
+ // CraftBukkit end
+
+ p_73117_1_.destroyedItemsNetCache.remove(Integer.valueOf(this.myEntity.getEntityId()));
if (!this.trackingPlayers.contains(p_73117_1_) && (this.isPlayerWatchingThisChunk(p_73117_1_) || this.myEntity.forceSpawn))
{
this.trackingPlayers.add(p_73117_1_);
@@ -369,6 +444,13 @@
ServersideAttributeMap serversideattributemap = (ServersideAttributeMap)((EntityLivingBase)this.myEntity).getAttributeMap();
Collection collection = serversideattributemap.getWatchedAttributes();
+ // CraftBukkit start - If sending own attributes send scaled health instead of current maximum health
+ if (this.myEntity.getEntityId() == p_73117_1_.getEntityId())
+ {
+ ((EntityPlayerMP) this.myEntity).getBukkitEntity().injectScaledMaxHealth(collection, false);
+ }
+
+ // CraftBukkit end
if (!collection.isEmpty())
{
p_73117_1_.playerNetServerHandler.sendPacket(new S20PacketEntityProperties(this.myEntity.getEntityId(), collection));
@@ -397,6 +479,14 @@
p_73117_1_.playerNetServerHandler.sendPacket(new S1BPacketEntityAttach(0, this.myEntity, this.myEntity.ridingEntity));
}
+ // CraftBukkit start
+ if (this.myEntity.riddenByEntity != null)
+ {
+ p_73117_1_.playerNetServerHandler.sendPacket(new S1BPacketEntityAttach(0, this.myEntity.riddenByEntity, this.myEntity));
+ }
+
+ // CraftBukkit end
+
if (this.myEntity instanceof EntityLiving && ((EntityLiving)this.myEntity).getLeashedToEntity() != null)
{
p_73117_1_.playerNetServerHandler.sendPacket(new S1BPacketEntityAttach(1, this.myEntity, ((EntityLiving)this.myEntity).getLeashedToEntity()));
@@ -425,6 +515,11 @@
}
}
+ // CraftBukkit start - Fix for nonsensical head yaw
+ this.lastHeadMotion = MathHelper.floor_float(this.myEntity.getRotationYawHead() * 256.0F / 360.0F); // tracker.ao() should be getHeadRotation
+ this.func_151259_a(new S19PacketEntityHeadLook(this.myEntity, (byte) lastHeadMotion));
+ // CraftBukkit end
+
if (this.myEntity instanceof EntityLivingBase)
{
EntityLivingBase entitylivingbase = (EntityLivingBase)this.myEntity;
@@ -465,7 +560,10 @@
{
if (this.myEntity.isDead)
{
- logger.warn("Fetching addPacket for removed entity");
+ // CraftBukkit start - Remove useless error spam, just return
+ // logger.warn("Fetching addPacket for removed entity");
+ return null;
+ // CraftBukkit end
}
Packet pkt = FMLNetworkHandler.getEntitySpawningPacket(this.myEntity);