keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fixed EntityJoinWorldEvent not being fired for some entitites on Server Worlds. Closes #2685

Browse source
This commit is contained in:
LexManos 2016-04-04 15:33:45 -07:00
parent 6342bfea3e
commit 9f1505dd53
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
patches/minecraft/net/minecraft/world/WorldServer.java.patch
View file

@ -212,6 +212,15 @@
} }
public boolean func_72838_d(Entity p_72838_1_) public boolean func_72838_d(Entity p_72838_1_)
@@ -1058,7 +1097,7 @@
{
for (Entity entity : Lists.newArrayList(p_175650_1_))
{
- if (this.func_184165_i(entity))
+ if (this.func_184165_i(entity) && !net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.EntityJoinWorldEvent(entity, this)))
{
this.field_72996_f.add(entity);
this.func_72923_a(entity);
@@ -1161,6 +1200,7 @@ @@ -1161,6 +1200,7 @@
public Explosion func_72885_a(Entity p_72885_1_, double p_72885_2_, double p_72885_4_, double p_72885_6_, float p_72885_8_, boolean p_72885_9_, boolean p_72885_10_) public Explosion func_72885_a(Entity p_72885_1_, double p_72885_2_, double p_72885_4_, double p_72885_6_, float p_72885_8_, boolean p_72885_9_, boolean p_72885_10_)
{ {