summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityTrackerEntry.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/EntityTrackerEntry.patch')
-rw-r--r--nms-patches/EntityTrackerEntry.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/EntityTrackerEntry.patch b/nms-patches/EntityTrackerEntry.patch
index db80f3e0..44d34923 100644
--- a/nms-patches/EntityTrackerEntry.patch
+++ b/nms-patches/EntityTrackerEntry.patch
@@ -22,8 +22,8 @@
EntityItemFrame entityitemframe = (EntityItemFrame) this.tracker;
ItemStack itemstack = entityitemframe.getItem();
-- if (itemstack != null && itemstack.getItem() instanceof ItemWorldMap) {
-+ if (this.a % 10 == 0 && itemstack != null && itemstack.getItem() instanceof ItemWorldMap) { // CraftBukkit - Moved this.m % 10 logic here so item frames do not enter the other blocks
+- if (itemstack.getItem() instanceof ItemWorldMap) {
++ if (this.a % 10 == 0 && itemstack.getItem() instanceof ItemWorldMap) { // CraftBukkit - Moved this.a % 10 logic here so item frames do not enter the other blocks
WorldMap worldmap = Items.FILLED_MAP.getSavedMap(itemstack, this.tracker.world);
- Iterator iterator = list.iterator();
+ Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
@@ -161,7 +161,7 @@
if (this.tracker instanceof EntityLiving) {
EntityLiving entityliving = (EntityLiving) this.tracker;
Iterator iterator = entityliving.getEffects().iterator();
-@@ -372,7 +444,10 @@
+@@ -380,7 +452,10 @@
private Packet<?> e() {
if (this.tracker.dead) {
@@ -172,4 +172,4 @@
+ // CraftBukkit end
}
- if (this.tracker instanceof EntityItem) {
+ if (this.tracker instanceof EntityPlayer) {