Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2024-10-07 20:17:45 +02:00
Code Issues Projects Releases Wiki Activity

Remove unneeded patch in 1.11

Browse Source
This commit is contained in:
filoghost 2016-11-18 11:21:10 +01:00
parent 099892f8a3
commit 7e72ed0d42
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java
View File

@ -10,7 +10,6 @@ import net.minecraft.server.v1_11_R1.ItemStack;
import net.minecraft.server.v1_11_R1.NBTTagCompound; import net.minecraft.server.v1_11_R1.NBTTagCompound;
import net.minecraft.server.v1_11_R1.NBTTagList; import net.minecraft.server.v1_11_R1.NBTTagList;
import net.minecraft.server.v1_11_R1.NBTTagString; import net.minecraft.server.v1_11_R1.NBTTagString;
import net.minecraft.server.v1_11_R1.PacketPlayOutMount;
import net.minecraft.server.v1_11_R1.World; import net.minecraft.server.v1_11_R1.World;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
@ -24,15 +23,12 @@ import com.gmail.filoghost.holographicdisplays.object.line.CraftItemLine;
import com.gmail.filoghost.holographicdisplays.util.DebugHandler; import com.gmail.filoghost.holographicdisplays.util.DebugHandler;
import com.gmail.filoghost.holographicdisplays.util.ItemUtils; import com.gmail.filoghost.holographicdisplays.util.ItemUtils;
import com.gmail.filoghost.holographicdisplays.util.ReflectionUtils; import com.gmail.filoghost.holographicdisplays.util.ReflectionUtils;
import com.gmail.filoghost.holographicdisplays.util.Utils;
public class EntityNMSItem extends EntityItem implements NMSItem { public class EntityNMSItem extends EntityItem implements NMSItem {
private boolean lockTick; private boolean lockTick;
private CraftItemLine parentPiece; private CraftItemLine parentPiece;
private int resendMountPacketTicks;
public EntityNMSItem(World world, CraftItemLine piece) { public EntityNMSItem(World world, CraftItemLine piece) {
super(world); super(world);
super.pickupDelay = 32767; // Lock the item pickup delay, also prevents entities from picking up the item super.pickupDelay = 32767; // Lock the item pickup delay, also prevents entities from picking up the item
@ -45,26 +41,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
// So it won't get removed. // So it won't get removed.
ticksLived = 0; ticksLived = 0;
if (resendMountPacketTicks++ > 20) {
resendMountPacketTicks = 0;
if (bB() != null) {
// Send a packet near to "remind" players that the item is riding the armor stand (Spigot bug or client bug)
PacketPlayOutMount mountPacket = new PacketPlayOutMount(bB());
for (Object obj : super.world.players) {
if (obj instanceof EntityPlayer) {
EntityPlayer nmsPlayer = (EntityPlayer) obj;
double distanceSquared = Utils.square(nmsPlayer.locX - super.locX) + Utils.square(nmsPlayer.locZ - super.locZ);
if (distanceSquared < 1024 && nmsPlayer.playerConnection != null) {
nmsPlayer.playerConnection.sendPacket(mountPacket);
}
}
}
}
}
if (!lockTick) { if (!lockTick) {
super.A_(); super.A_();
} }