30 lines
1.6 KiB
Diff
30 lines
1.6 KiB
Diff
--- a/net/minecraft/world/TrackedEntity.java
|
|
+++ b/net/minecraft/world/TrackedEntity.java
|
|
@@ -80,9 +80,8 @@
|
|
if (this.field_219461_c instanceof ItemFrameEntity && this.field_219472_n % 10 == 0) {
|
|
ItemFrameEntity itemframeentity = (ItemFrameEntity)this.field_219461_c;
|
|
ItemStack itemstack = itemframeentity.func_82335_i();
|
|
- if (itemstack.func_77973_b() instanceof FilledMapItem) {
|
|
- MapData mapdata = FilledMapItem.func_195950_a(itemstack, this.field_219460_b);
|
|
-
|
|
+ MapData mapdata = FilledMapItem.func_195950_a(itemstack, this.field_219460_b);
|
|
+ if (mapdata != null) {
|
|
for(ServerPlayerEntity serverplayerentity : this.field_219460_b.func_217369_A()) {
|
|
mapdata.func_76191_a(serverplayerentity, itemstack);
|
|
IPacket<?> ipacket = ((FilledMapItem)itemstack.func_77973_b()).func_150911_c(itemstack, this.field_219460_b, serverplayerentity);
|
|
@@ -186,12 +185,14 @@
|
|
public void func_219454_a(ServerPlayerEntity p_219454_1_) {
|
|
this.field_219461_c.func_184203_c(p_219454_1_);
|
|
p_219454_1_.func_152339_d(this.field_219461_c);
|
|
+ net.minecraftforge.event.ForgeEventFactory.onStopEntityTracking(this.field_219461_c, p_219454_1_);
|
|
}
|
|
|
|
public void func_219455_b(ServerPlayerEntity p_219455_1_) {
|
|
this.func_219452_a(p_219455_1_.field_71135_a::func_147359_a);
|
|
this.field_219461_c.func_184178_b(p_219455_1_);
|
|
p_219455_1_.func_184848_d(this.field_219461_c);
|
|
+ net.minecraftforge.event.ForgeEventFactory.onStartEntityTracking(this.field_219461_c, p_219455_1_);
|
|
}
|
|
|
|
public void func_219452_a(Consumer<IPacket<?>> p_219452_1_) {
|