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

Fix #4386 Race condition when unloading chunks causes dead tile entities

Browse source
This commit is contained in:
mezz 2017-09-09 12:56:21 -07:00
parent bcea480d36
commit 638a54b04a
2 changed files with 89 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

176
patches/minecraft/net/minecraft/world/World.java.patch
View file

@ -17,21 +17,20 @@
private int field_181546_a = 63; private int field_181546_a = 63;
protected boolean field_72999_e; protected boolean field_72999_e;
public final List<Entity> field_72996_f = Lists.<Entity>newArrayList(); public final List<Entity> field_72996_f = Lists.<Entity>newArrayList();
@@ -108,6 +115,13 @@ @@ -108,6 +115,12 @@
private final WorldBorder field_175728_M; private final WorldBorder field_175728_M;
int[] field_72994_J; int[] field_72994_J;
+ public boolean restoringBlockSnapshots = false; + public boolean restoringBlockSnapshots = false;
+ public boolean captureBlockSnapshots = false; + public boolean captureBlockSnapshots = false;
+ public java.util.ArrayList<net.minecraftforge.common.util.BlockSnapshot> capturedBlockSnapshots = new java.util.ArrayList<net.minecraftforge.common.util.BlockSnapshot>(); + public java.util.ArrayList<net.minecraftforge.common.util.BlockSnapshot> capturedBlockSnapshots = new java.util.ArrayList<net.minecraftforge.common.util.BlockSnapshot>();
+ private it.unimi.dsi.fastutil.longs.LongCollection tileEntitiesChunkToBeRemoved = new it.unimi.dsi.fastutil.longs.LongOpenHashSet();
+ private net.minecraftforge.common.capabilities.CapabilityDispatcher capabilities; + private net.minecraftforge.common.capabilities.CapabilityDispatcher capabilities;
+ private net.minecraftforge.common.util.WorldCapabilityData capabilityData; + private net.minecraftforge.common.util.WorldCapabilityData capabilityData;
+ +
protected World(ISaveHandler p_i45749_1_, WorldInfo p_i45749_2_, WorldProvider p_i45749_3_, Profiler p_i45749_4_, boolean p_i45749_5_) protected World(ISaveHandler p_i45749_1_, WorldInfo p_i45749_2_, WorldProvider p_i45749_3_, Profiler p_i45749_4_, boolean p_i45749_5_)
{ {
this.field_73021_x = Lists.newArrayList(this.field_184152_t); this.field_73021_x = Lists.newArrayList(this.field_184152_t);
@@ -122,6 +136,7 @@ @@ -122,6 +135,7 @@
this.field_73011_w = p_i45749_3_; this.field_73011_w = p_i45749_3_;
this.field_72995_K = p_i45749_5_; this.field_72995_K = p_i45749_5_;
this.field_175728_M = p_i45749_3_.func_177501_r(); this.field_175728_M = p_i45749_3_.func_177501_r();
@ -39,7 +38,7 @@
} }
public World func_175643_b() public World func_175643_b()
@@ -131,6 +146,11 @@ @@ -131,6 +145,11 @@
public Biome func_180494_b(final BlockPos p_180494_1_) public Biome func_180494_b(final BlockPos p_180494_1_)
{ {
@ -51,7 +50,7 @@
if (this.func_175667_e(p_180494_1_)) if (this.func_175667_e(p_180494_1_))
{ {
Chunk chunk = this.func_175726_f(p_180494_1_); Chunk chunk = this.func_175726_f(p_180494_1_);
@@ -207,7 +227,7 @@ @@ -207,7 +226,7 @@
public boolean func_175623_d(BlockPos p_175623_1_) public boolean func_175623_d(BlockPos p_175623_1_)
{ {
@ -60,7 +59,7 @@
} }
public boolean func_175667_e(BlockPos p_175667_1_) public boolean func_175667_e(BlockPos p_175667_1_)
@@ -308,24 +328,50 @@ @@ -308,24 +327,50 @@
else else
{ {
Chunk chunk = this.func_175726_f(p_180501_1_); Chunk chunk = this.func_175726_f(p_180501_1_);
@ -114,7 +113,7 @@
this.func_184138_a(p_180501_1_, iblockstate, p_180501_2_, p_180501_3_); this.func_184138_a(p_180501_1_, iblockstate, p_180501_2_, p_180501_3_);
} }
@@ -342,8 +388,6 @@ @@ -342,8 +387,6 @@
{ {
this.func_190522_c(p_180501_1_, block); this.func_190522_c(p_180501_1_, block);
} }
@ -123,7 +122,7 @@
} }
} }
} }
@@ -358,7 +402,7 @@ @@ -358,7 +401,7 @@
IBlockState iblockstate = this.func_180495_p(p_175655_1_); IBlockState iblockstate = this.func_180495_p(p_175655_1_);
Block block = iblockstate.func_177230_c(); Block block = iblockstate.func_177230_c();
@ -132,7 +131,7 @@
{ {
return false; return false;
} }
@@ -441,6 +485,9 @@ @@ -441,6 +484,9 @@
public void func_175685_c(BlockPos p_175685_1_, Block p_175685_2_, boolean p_175685_3_) public void func_175685_c(BlockPos p_175685_1_, Block p_175685_2_, boolean p_175685_3_)
{ {
@ -142,7 +141,7 @@
this.func_190524_a(p_175685_1_.func_177976_e(), p_175685_2_, p_175685_1_); this.func_190524_a(p_175685_1_.func_177976_e(), p_175685_2_, p_175685_1_);
this.func_190524_a(p_175685_1_.func_177974_f(), p_175685_2_, p_175685_1_); this.func_190524_a(p_175685_1_.func_177974_f(), p_175685_2_, p_175685_1_);
this.func_190524_a(p_175685_1_.func_177977_b(), p_175685_2_, p_175685_1_); this.func_190524_a(p_175685_1_.func_177977_b(), p_175685_2_, p_175685_1_);
@@ -456,6 +503,11 @@ @@ -456,6 +502,11 @@
public void func_175695_a(BlockPos p_175695_1_, Block p_175695_2_, EnumFacing p_175695_3_) public void func_175695_a(BlockPos p_175695_1_, Block p_175695_2_, EnumFacing p_175695_3_)
{ {
@ -154,7 +153,7 @@
if (p_175695_3_ != EnumFacing.WEST) if (p_175695_3_ != EnumFacing.WEST)
{ {
this.func_190524_a(p_175695_1_.func_177976_e(), p_175695_2_, p_175695_1_); this.func_190524_a(p_175695_1_.func_177976_e(), p_175695_2_, p_175695_1_);
@@ -527,11 +579,11 @@ @@ -527,11 +578,11 @@
{ {
IBlockState iblockstate = this.func_180495_p(p_190529_1_); IBlockState iblockstate = this.func_180495_p(p_190529_1_);
@ -168,7 +167,7 @@
} }
catch (Throwable throwable) catch (Throwable throwable)
{ {
@@ -588,7 +640,7 @@ @@ -588,7 +639,7 @@
{ {
IBlockState iblockstate = this.func_180495_p(blockpos1); IBlockState iblockstate = this.func_180495_p(blockpos1);
@ -177,7 +176,7 @@
{ {
return false; return false;
} }
@@ -862,7 +914,7 @@ @@ -862,7 +913,7 @@
public boolean func_72935_r() public boolean func_72935_r()
{ {
@ -186,7 +185,7 @@
} }
@Nullable @Nullable
@@ -1065,6 +1117,13 @@ @@ -1065,6 +1116,13 @@
public void func_184148_a(@Nullable EntityPlayer p_184148_1_, double p_184148_2_, double p_184148_4_, double p_184148_6_, SoundEvent p_184148_8_, SoundCategory p_184148_9_, float p_184148_10_, float p_184148_11_) public void func_184148_a(@Nullable EntityPlayer p_184148_1_, double p_184148_2_, double p_184148_4_, double p_184148_6_, SoundEvent p_184148_8_, SoundCategory p_184148_9_, float p_184148_10_, float p_184148_11_)
{ {
@ -200,7 +199,7 @@
for (int i = 0; i < this.field_73021_x.size(); ++i) for (int i = 0; i < this.field_73021_x.size(); ++i)
{ {
((IWorldEventListener)this.field_73021_x.get(i)).func_184375_a(p_184148_1_, p_184148_8_, p_184148_9_, p_184148_2_, p_184148_4_, p_184148_6_, p_184148_10_, p_184148_11_); ((IWorldEventListener)this.field_73021_x.get(i)).func_184375_a(p_184148_1_, p_184148_8_, p_184148_9_, p_184148_2_, p_184148_4_, p_184148_6_, p_184148_10_, p_184148_11_);
@@ -1118,6 +1177,9 @@ @@ -1118,6 +1176,9 @@
public boolean func_72838_d(Entity p_72838_1_) public boolean func_72838_d(Entity p_72838_1_)
{ {
@ -210,7 +209,7 @@
int i = MathHelper.func_76128_c(p_72838_1_.field_70165_t / 16.0D); int i = MathHelper.func_76128_c(p_72838_1_.field_70165_t / 16.0D);
int j = MathHelper.func_76128_c(p_72838_1_.field_70161_v / 16.0D); int j = MathHelper.func_76128_c(p_72838_1_.field_70161_v / 16.0D);
boolean flag = p_72838_1_.field_98038_p; boolean flag = p_72838_1_.field_98038_p;
@@ -1140,6 +1202,8 @@ @@ -1140,6 +1201,8 @@
this.func_72854_c(); this.func_72854_c();
} }
@ -219,7 +218,7 @@
this.func_72964_e(i, j).func_76612_a(p_72838_1_); this.func_72964_e(i, j).func_76612_a(p_72838_1_);
this.field_72996_f.add(p_72838_1_); this.field_72996_f.add(p_72838_1_);
this.func_72923_a(p_72838_1_); this.func_72923_a(p_72838_1_);
@@ -1268,6 +1332,7 @@ @@ -1268,6 +1331,7 @@
} }
iblockstate1.func_185908_a(this, blockpos$pooledmutableblockpos, p_191504_2_, p_191504_4_, p_191504_1_, false); iblockstate1.func_185908_a(this, blockpos$pooledmutableblockpos, p_191504_2_, p_191504_4_, p_191504_1_, false);
@ -227,7 +226,7 @@
if (p_191504_3_ && !p_191504_4_.isEmpty()) if (p_191504_3_ && !p_191504_4_.isEmpty())
{ {
@@ -1319,11 +1384,10 @@ @@ -1319,11 +1383,10 @@
} }
} }
} }
@ -240,7 +239,7 @@
public void func_72848_b(IWorldEventListener p_72848_1_) public void func_72848_b(IWorldEventListener p_72848_1_)
{ {
this.field_73021_x.remove(p_72848_1_); this.field_73021_x.remove(p_72848_1_);
@@ -1361,19 +1425,38 @@ @@ -1361,19 +1424,38 @@
public int func_72967_a(float p_72967_1_) public int func_72967_a(float p_72967_1_)
{ {
@ -281,7 +280,7 @@
float f = this.func_72826_c(p_72971_1_); float f = this.func_72826_c(p_72971_1_);
float f1 = 1.0F - (MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.2F); float f1 = 1.0F - (MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.2F);
f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F); f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F);
@@ -1386,6 +1469,12 @@ @@ -1386,6 +1468,12 @@
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public Vec3d func_72833_a(Entity p_72833_1_, float p_72833_2_) public Vec3d func_72833_a(Entity p_72833_1_, float p_72833_2_)
{ {
@ -294,7 +293,7 @@
float f = this.func_72826_c(p_72833_2_); float f = this.func_72826_c(p_72833_2_);
float f1 = MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.5F; float f1 = MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.5F;
f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F); f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F);
@@ -1393,9 +1482,7 @@ @@ -1393,9 +1481,7 @@
int j = MathHelper.func_76128_c(p_72833_1_.field_70163_u); int j = MathHelper.func_76128_c(p_72833_1_.field_70163_u);
int k = MathHelper.func_76128_c(p_72833_1_.field_70161_v); int k = MathHelper.func_76128_c(p_72833_1_.field_70161_v);
BlockPos blockpos = new BlockPos(i, j, k); BlockPos blockpos = new BlockPos(i, j, k);
@ -305,7 +304,7 @@
float f3 = (float)(l >> 16 & 255) / 255.0F; float f3 = (float)(l >> 16 & 255) / 255.0F;
float f4 = (float)(l >> 8 & 255) / 255.0F; float f4 = (float)(l >> 8 & 255) / 255.0F;
float f5 = (float)(l & 255) / 255.0F; float f5 = (float)(l & 255) / 255.0F;
@@ -1444,20 +1531,25 @@ @@ -1444,20 +1530,25 @@
public float func_72826_c(float p_72826_1_) public float func_72826_c(float p_72826_1_)
{ {
@ -334,7 +333,7 @@
public float func_72929_e(float p_72929_1_) public float func_72929_e(float p_72929_1_)
{ {
float f = this.func_72826_c(p_72929_1_); float f = this.func_72826_c(p_72929_1_);
@@ -1467,6 +1559,12 @@ @@ -1467,6 +1558,12 @@
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public Vec3d func_72824_f(float p_72824_1_) public Vec3d func_72824_f(float p_72824_1_)
{ {
@ -347,7 +346,7 @@
float f = this.func_72826_c(p_72824_1_); float f = this.func_72826_c(p_72824_1_);
float f1 = MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.5F; float f1 = MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.5F;
f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F); f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F);
@@ -1522,9 +1620,9 @@ @@ -1522,9 +1619,9 @@
for (blockpos = new BlockPos(p_175672_1_.func_177958_n(), chunk.func_76625_h() + 16, p_175672_1_.func_177952_p()); blockpos.func_177956_o() >= 0; blockpos = blockpos1) for (blockpos = new BlockPos(p_175672_1_.func_177958_n(), chunk.func_76625_h() + 16, p_175672_1_.func_177952_p()); blockpos.func_177956_o() >= 0; blockpos = blockpos1)
{ {
blockpos1 = blockpos.func_177977_b(); blockpos1 = blockpos.func_177977_b();
@ -359,7 +358,7 @@
{ {
break; break;
} }
@@ -1536,6 +1634,12 @@ @@ -1536,6 +1633,12 @@
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public float func_72880_h(float p_72880_1_) public float func_72880_h(float p_72880_1_)
{ {
@ -372,7 +371,7 @@
float f = this.func_72826_c(p_72880_1_); float f = this.func_72826_c(p_72880_1_);
float f1 = 1.0F - (MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.25F); float f1 = 1.0F - (MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.25F);
f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F); f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F);
@@ -1570,6 +1674,7 @@ @@ -1570,6 +1673,7 @@
try try
{ {
@ -380,7 +379,7 @@
++entity.field_70173_aa; ++entity.field_70173_aa;
entity.func_70071_h_(); entity.func_70071_h_();
} }
@@ -1587,6 +1692,12 @@ @@ -1587,6 +1691,12 @@
entity.func_85029_a(crashreportcategory); entity.func_85029_a(crashreportcategory);
} }
@ -393,7 +392,7 @@
throw new ReportedException(crashreport); throw new ReportedException(crashreport);
} }
@@ -1648,6 +1759,12 @@ @@ -1648,6 +1758,12 @@
CrashReport crashreport1 = CrashReport.func_85055_a(throwable1, "Ticking entity"); CrashReport crashreport1 = CrashReport.func_85055_a(throwable1, "Ticking entity");
CrashReportCategory crashreportcategory1 = crashreport1.func_85058_a("Entity being ticked"); CrashReportCategory crashreportcategory1 = crashreport1.func_85058_a("Entity being ticked");
entity2.func_85029_a(crashreportcategory1); entity2.func_85029_a(crashreportcategory1);
@ -406,7 +405,7 @@
throw new ReportedException(crashreport1); throw new ReportedException(crashreport1);
} }
} }
@@ -1684,7 +1801,7 @@ @@ -1684,7 +1800,7 @@
{ {
BlockPos blockpos = tileentity.func_174877_v(); BlockPos blockpos = tileentity.func_174877_v();
@ -415,7 +414,7 @@
{ {
try try
{ {
@@ -1700,6 +1817,13 @@ @@ -1700,6 +1816,13 @@
CrashReport crashreport2 = CrashReport.func_85055_a(throwable, "Ticking block entity"); CrashReport crashreport2 = CrashReport.func_85055_a(throwable, "Ticking block entity");
CrashReportCategory crashreportcategory2 = crashreport2.func_85058_a("Block entity being ticked"); CrashReportCategory crashreportcategory2 = crashreport2.func_85058_a("Block entity being ticked");
tileentity.func_145828_a(crashreportcategory2); tileentity.func_145828_a(crashreportcategory2);
@ -429,7 +428,7 @@
throw new ReportedException(crashreport2); throw new ReportedException(crashreport2);
} }
} }
@@ -1712,20 +1836,29 @@ @@ -1712,20 +1835,31 @@
if (this.func_175667_e(tileentity.func_174877_v())) if (this.func_175667_e(tileentity.func_174877_v()))
{ {
@ -446,23 +445,27 @@
- -
if (!this.field_147483_b.isEmpty()) if (!this.field_147483_b.isEmpty())
{ {
- this.field_175730_i.removeAll(this.field_147483_b);
- this.field_147482_g.removeAll(this.field_147483_b);
+ for (Object tile : field_147483_b) + for (Object tile : field_147483_b)
+ { + {
+ ((TileEntity)tile).onChunkUnload(); + ((TileEntity)tile).onChunkUnload();
+ } + }
+ +
this.field_175730_i.removeAll(this.field_147483_b); + // forge: faster "contains" makes this removal much more efficient
this.field_147482_g.removeAll(this.field_147483_b); + java.util.Set<TileEntity> remove = java.util.Collections.newSetFromMap(new java.util.IdentityHashMap<>());
+ remove.addAll(field_147483_b);
+ this.field_175730_i.removeAll(remove);
+ this.field_147482_g.removeAll(remove);
this.field_147483_b.clear(); this.field_147483_b.clear();
} }
+ this.removeTileEntitiesForRemovedChunks();
+ this.field_147481_N = false; //FML Move below remove to prevent CMEs + this.field_147481_N = false; //FML Move below remove to prevent CMEs
+ +
this.field_72984_F.func_76318_c("pendingBlockEntities"); this.field_72984_F.func_76318_c("pendingBlockEntities");
if (!this.field_147484_a.isEmpty()) if (!this.field_147484_a.isEmpty())
@@ -1764,12 +1897,18 @@ @@ -1764,12 +1898,18 @@
public boolean func_175700_a(TileEntity p_175700_1_) public boolean func_175700_a(TileEntity p_175700_1_)
{ {
@ -481,7 +484,7 @@
if (this.field_72995_K) if (this.field_72995_K)
{ {
@@ -1785,6 +1924,11 @@ @@ -1785,6 +1925,11 @@
{ {
if (this.field_147481_N) if (this.field_147481_N)
{ {
@ -493,7 +496,7 @@
this.field_147484_a.addAll(p_147448_1_); this.field_147484_a.addAll(p_147448_1_);
} }
else else
@@ -1807,9 +1951,13 @@ @@ -1807,9 +1952,13 @@
{ {
int j2 = MathHelper.func_76128_c(p_72866_1_.field_70165_t); int j2 = MathHelper.func_76128_c(p_72866_1_.field_70165_t);
int k2 = MathHelper.func_76128_c(p_72866_1_.field_70161_v); int k2 = MathHelper.func_76128_c(p_72866_1_.field_70161_v);
@ -509,7 +512,7 @@
{ {
return; return;
} }
@@ -1831,6 +1979,7 @@ @@ -1831,6 +1980,7 @@
} }
else else
{ {
@ -517,7 +520,7 @@
p_72866_1_.func_70071_h_(); p_72866_1_.func_70071_h_();
} }
} }
@@ -2011,6 +2160,11 @@ @@ -2011,6 +2161,11 @@
blockpos$pooledmutableblockpos.func_185344_t(); blockpos$pooledmutableblockpos.func_185344_t();
return true; return true;
} }
@ -529,7 +532,7 @@
} }
} }
} }
@@ -2050,6 +2204,16 @@ @@ -2050,6 +2205,16 @@
IBlockState iblockstate1 = this.func_180495_p(blockpos$pooledmutableblockpos); IBlockState iblockstate1 = this.func_180495_p(blockpos$pooledmutableblockpos);
Block block = iblockstate1.func_177230_c(); Block block = iblockstate1.func_177230_c();
@ -546,7 +549,7 @@
if (iblockstate1.func_185904_a() == p_72918_2_) if (iblockstate1.func_185904_a() == p_72918_2_)
{ {
double d0 = (double)((float)(i4 + 1) - BlockLiquid.func_149801_b(((Integer)iblockstate1.func_177229_b(BlockLiquid.field_176367_b)).intValue())); double d0 = (double)((float)(i4 + 1) - BlockLiquid.func_149801_b(((Integer)iblockstate1.func_177229_b(BlockLiquid.field_176367_b)).intValue()));
@@ -2116,6 +2280,7 @@ @@ -2116,6 +2281,7 @@
public Explosion func_72885_a(@Nullable 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(@Nullable 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_)
{ {
Explosion explosion = new Explosion(this, p_72885_1_, p_72885_2_, p_72885_4_, p_72885_6_, p_72885_8_, p_72885_9_, p_72885_10_); Explosion explosion = new Explosion(this, p_72885_1_, p_72885_2_, p_72885_4_, p_72885_6_, p_72885_8_, p_72885_9_, p_72885_10_);
@ -554,7 +557,7 @@
explosion.func_77278_a(); explosion.func_77278_a();
explosion.func_77279_a(true); explosion.func_77279_a(true);
return explosion; return explosion;
@@ -2238,6 +2403,7 @@ @@ -2238,6 +2404,7 @@
public void func_175690_a(BlockPos p_175690_1_, @Nullable TileEntity p_175690_2_) public void func_175690_a(BlockPos p_175690_1_, @Nullable TileEntity p_175690_2_)
{ {
@ -562,7 +565,7 @@
if (!this.func_189509_E(p_175690_1_)) if (!this.func_189509_E(p_175690_1_))
{ {
if (p_175690_2_ != null && !p_175690_2_.func_145837_r()) if (p_175690_2_ != null && !p_175690_2_.func_145837_r())
@@ -2245,6 +2411,8 @@ @@ -2245,6 +2412,8 @@
if (this.field_147481_N) if (this.field_147481_N)
{ {
p_175690_2_.func_174878_a(p_175690_1_); p_175690_2_.func_174878_a(p_175690_1_);
@ -571,7 +574,7 @@
Iterator<TileEntity> iterator1 = this.field_147484_a.iterator(); Iterator<TileEntity> iterator1 = this.field_147484_a.iterator();
while (iterator1.hasNext()) while (iterator1.hasNext())
@@ -2262,7 +2430,8 @@ @@ -2262,7 +2431,8 @@
} }
else else
{ {
@ -581,7 +584,7 @@
this.func_175700_a(p_175690_2_); this.func_175700_a(p_175690_2_);
} }
} }
@@ -2277,6 +2446,8 @@ @@ -2277,6 +2447,8 @@
{ {
tileentity2.func_145843_s(); tileentity2.func_145843_s();
this.field_147484_a.remove(tileentity2); this.field_147484_a.remove(tileentity2);
@ -590,7 +593,7 @@
} }
else else
{ {
@@ -2289,6 +2460,7 @@ @@ -2289,6 +2461,7 @@
this.func_175726_f(p_175713_1_).func_177425_e(p_175713_1_); this.func_175726_f(p_175713_1_).func_177425_e(p_175713_1_);
} }
@ -598,7 +601,7 @@
} }
public void func_147457_a(TileEntity p_147457_1_) public void func_147457_a(TileEntity p_147457_1_)
@@ -2315,7 +2487,7 @@ @@ -2315,7 +2488,7 @@
if (chunk1 != null && !chunk1.func_76621_g()) if (chunk1 != null && !chunk1.func_76621_g())
{ {
IBlockState iblockstate1 = this.func_180495_p(p_175677_1_); IBlockState iblockstate1 = this.func_180495_p(p_175677_1_);
@ -607,7 +610,7 @@
} }
else else
{ {
@@ -2338,6 +2510,7 @@ @@ -2338,6 +2511,7 @@
{ {
this.field_72985_G = p_72891_1_; this.field_72985_G = p_72891_1_;
this.field_72992_H = p_72891_2_; this.field_72992_H = p_72891_2_;
@ -615,7 +618,7 @@
} }
public void func_72835_b() public void func_72835_b()
@@ -2347,6 +2520,11 @@ @@ -2347,6 +2521,11 @@
protected void func_72947_a() protected void func_72947_a()
{ {
@ -627,7 +630,7 @@
if (this.field_72986_A.func_76059_o()) if (this.field_72986_A.func_76059_o())
{ {
this.field_73004_o = 1.0F; this.field_73004_o = 1.0F;
@@ -2360,6 +2538,11 @@ @@ -2360,6 +2539,11 @@
protected void func_72979_l() protected void func_72979_l()
{ {
@ -639,7 +642,7 @@
if (this.field_73011_w.func_191066_m()) if (this.field_73011_w.func_191066_m())
{ {
if (!this.field_72995_K) if (!this.field_72995_K)
@@ -2484,6 +2667,11 @@ @@ -2484,6 +2668,11 @@
public boolean func_175670_e(BlockPos p_175670_1_, boolean p_175670_2_) public boolean func_175670_e(BlockPos p_175670_1_, boolean p_175670_2_)
{ {
@ -651,7 +654,7 @@
Biome biome = this.func_180494_b(p_175670_1_); Biome biome = this.func_180494_b(p_175670_1_);
float f = biome.func_180626_a(p_175670_1_); float f = biome.func_180626_a(p_175670_1_);
@@ -2525,6 +2713,11 @@ @@ -2525,6 +2714,11 @@
public boolean func_175708_f(BlockPos p_175708_1_, boolean p_175708_2_) public boolean func_175708_f(BlockPos p_175708_1_, boolean p_175708_2_)
{ {
@ -663,7 +666,7 @@
Biome biome = this.func_180494_b(p_175708_1_); Biome biome = this.func_180494_b(p_175708_1_);
float f = biome.func_180626_a(p_175708_1_); float f = biome.func_180626_a(p_175708_1_);
@@ -2542,7 +2735,7 @@ @@ -2542,7 +2736,7 @@
{ {
IBlockState iblockstate1 = this.func_180495_p(p_175708_1_); IBlockState iblockstate1 = this.func_180495_p(p_175708_1_);
@ -672,7 +675,7 @@
{ {
return true; return true;
} }
@@ -2574,10 +2767,11 @@ @@ -2574,10 +2768,11 @@
else else
{ {
IBlockState iblockstate1 = this.func_180495_p(p_175638_1_); IBlockState iblockstate1 = this.func_180495_p(p_175638_1_);
@ -687,7 +690,7 @@
{ {
k2 = 1; k2 = 1;
} }
@@ -2683,7 +2877,8 @@ @@ -2683,7 +2878,8 @@
int k6 = k4 + enumfacing.func_96559_d(); int k6 = k4 + enumfacing.func_96559_d();
int l6 = l4 + enumfacing.func_82599_e(); int l6 = l4 + enumfacing.func_82599_e();
blockpos$pooledmutableblockpos.func_181079_c(j6, k6, l6); blockpos$pooledmutableblockpos.func_181079_c(j6, k6, l6);
@ -697,7 +700,7 @@
j5 = this.func_175642_b(p_180500_1_, blockpos$pooledmutableblockpos); j5 = this.func_175642_b(p_180500_1_, blockpos$pooledmutableblockpos);
if (j5 == i5 - i7 && k2 < this.field_72994_J.length) if (j5 == i5 - i7 && k2 < this.field_72994_J.length)
@@ -2791,10 +2986,10 @@ @@ -2791,10 +2987,10 @@
public List<Entity> func_175674_a(@Nullable Entity p_175674_1_, AxisAlignedBB p_175674_2_, @Nullable Predicate <? super Entity > p_175674_3_) public List<Entity> func_175674_a(@Nullable Entity p_175674_1_, AxisAlignedBB p_175674_2_, @Nullable Predicate <? super Entity > p_175674_3_)
{ {
List<Entity> list = Lists.<Entity>newArrayList(); List<Entity> list = Lists.<Entity>newArrayList();
@ -712,7 +715,7 @@
for (int j3 = j2; j3 <= k2; ++j3) for (int j3 = j2; j3 <= k2; ++j3)
{ {
@@ -2847,10 +3042,10 @@ @@ -2847,10 +3043,10 @@
public <T extends Entity> List<T> func_175647_a(Class <? extends T > p_175647_1_, AxisAlignedBB p_175647_2_, @Nullable Predicate <? super T > p_175647_3_) public <T extends Entity> List<T> func_175647_a(Class <? extends T > p_175647_1_, AxisAlignedBB p_175647_2_, @Nullable Predicate <? super T > p_175647_3_)
{ {
@ -727,7 +730,7 @@
List<T> list = Lists.<T>newArrayList(); List<T> list = Lists.<T>newArrayList();
for (int j3 = j2; j3 < k2; ++j3) for (int j3 = j2; j3 < k2; ++j3)
@@ -2930,11 +3125,13 @@ @@ -2930,11 +3126,13 @@
public void func_175650_b(Collection<Entity> p_175650_1_) public void func_175650_b(Collection<Entity> p_175650_1_)
{ {
@ -744,7 +747,7 @@
} }
} }
@@ -2958,7 +3155,7 @@ @@ -2958,7 +3156,7 @@
} }
else else
{ {
@ -753,7 +756,7 @@
} }
} }
@@ -3042,7 +3239,7 @@ @@ -3042,7 +3240,7 @@
public int func_175651_c(BlockPos p_175651_1_, EnumFacing p_175651_2_) public int func_175651_c(BlockPos p_175651_1_, EnumFacing p_175651_2_)
{ {
IBlockState iblockstate1 = this.func_180495_p(p_175651_1_); IBlockState iblockstate1 = this.func_180495_p(p_175651_1_);
@ -762,7 +765,7 @@
} }
public boolean func_175640_z(BlockPos p_175640_1_) public boolean func_175640_z(BlockPos p_175640_1_)
@@ -3208,6 +3405,8 @@ @@ -3208,6 +3406,8 @@
d2 *= ((Double)MoreObjects.firstNonNull(p_184150_11_.apply(entityplayer1), Double.valueOf(1.0D))).doubleValue(); d2 *= ((Double)MoreObjects.firstNonNull(p_184150_11_.apply(entityplayer1), Double.valueOf(1.0D))).doubleValue();
} }
@ -771,7 +774,7 @@
if ((p_184150_9_ < 0.0D || Math.abs(entityplayer1.field_70163_u - p_184150_3_) < p_184150_9_ * p_184150_9_) && (p_184150_7_ < 0.0D || d1 < d2 * d2) && (d0 == -1.0D || d1 < d0)) if ((p_184150_9_ < 0.0D || Math.abs(entityplayer1.field_70163_u - p_184150_3_) < p_184150_9_ * p_184150_9_) && (p_184150_7_ < 0.0D || d1 < d2 * d2) && (d0 == -1.0D || d1 < d0))
{ {
d0 = d1; d0 = d1;
@@ -3269,7 +3468,7 @@ @@ -3269,7 +3469,7 @@
public long func_72905_C() public long func_72905_C()
{ {
@ -780,7 +783,7 @@
} }
public long func_82737_E() public long func_82737_E()
@@ -3279,17 +3478,17 @@ @@ -3279,17 +3479,17 @@
public long func_72820_D() public long func_72820_D()
{ {
@ -801,7 +804,7 @@
if (!this.func_175723_af().func_177746_a(blockpos1)) if (!this.func_175723_af().func_177746_a(blockpos1))
{ {
@@ -3301,7 +3500,7 @@ @@ -3301,7 +3501,7 @@
public void func_175652_B(BlockPos p_175652_1_) public void func_175652_B(BlockPos p_175652_1_)
{ {
@ -810,7 +813,7 @@
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@@ -3321,12 +3520,18 @@ @@ -3321,12 +3521,18 @@
if (!this.field_72996_f.contains(p_72897_1_)) if (!this.field_72996_f.contains(p_72897_1_))
{ {
@ -829,7 +832,7 @@
return true; return true;
} }
@@ -3428,8 +3633,7 @@ @@ -3428,8 +3634,7 @@
public boolean func_180502_D(BlockPos p_180502_1_) public boolean func_180502_D(BlockPos p_180502_1_)
{ {
@ -839,7 +842,7 @@
} }
@Nullable @Nullable
@@ -3490,12 +3694,12 @@ @@ -3490,12 +3695,12 @@
public int func_72800_K() public int func_72800_K()
{ {
@ -854,7 +857,7 @@
} }
public Random func_72843_D(int p_72843_1_, int p_72843_2_, int p_72843_3_) public Random func_72843_D(int p_72843_1_, int p_72843_2_, int p_72843_3_)
@@ -3539,7 +3743,7 @@ @@ -3539,7 +3744,7 @@
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public double func_72919_O() public double func_72919_O()
{ {
@ -863,7 +866,7 @@
} }
public void func_175715_c(int p_175715_1_, BlockPos p_175715_2_, int p_175715_3_) public void func_175715_c(int p_175715_1_, BlockPos p_175715_2_, int p_175715_3_)
@@ -3573,7 +3777,7 @@ @@ -3573,7 +3778,7 @@
public void func_175666_e(BlockPos p_175666_1_, Block p_175666_2_) public void func_175666_e(BlockPos p_175666_1_, Block p_175666_2_)
{ {
@ -872,7 +875,7 @@
{ {
BlockPos blockpos1 = p_175666_1_.func_177972_a(enumfacing); BlockPos blockpos1 = p_175666_1_.func_177972_a(enumfacing);
@@ -3581,18 +3785,15 @@ @@ -3581,18 +3786,15 @@
{ {
IBlockState iblockstate1 = this.func_180495_p(blockpos1); IBlockState iblockstate1 = this.func_180495_p(blockpos1);
@ -895,7 +898,7 @@
} }
} }
} }
@@ -3658,6 +3859,149 @@ @@ -3658,6 +3860,124 @@
return j2 >= -128 && j2 <= 128 && k2 >= -128 && k2 <= 128; return j2 >= -128 && j2 <= 128 && k2 >= -128 && k2 <= 128;
} }
@ -974,37 +977,12 @@
+ return count; + return count;
+ } + }
+ +
+ @Deprecated // remove in 1.13
+ public void markTileEntitiesInChunkForRemoval(Chunk chunk) + public void markTileEntitiesInChunkForRemoval(Chunk chunk)
+ { + {
+ if (!chunk.func_177434_r().isEmpty()) + for (TileEntity tileentity : chunk.func_177434_r().values())
+ { + {
+ long pos = net.minecraft.util.math.ChunkPos.func_77272_a(chunk.field_76635_g, chunk.field_76647_h); + func_147457_a(tileentity);
+ this.tileEntitiesChunkToBeRemoved.add(pos);
+ }
+ }
+
+ private void removeTileEntitiesForRemovedChunks()
+ {
+ if (!this.tileEntitiesChunkToBeRemoved.isEmpty())
+ {
+ java.util.function.Predicate<TileEntity> isInChunk = (tileEntity) ->
+ {
+ BlockPos tilePos = tileEntity.func_174877_v();
+ long tileChunkPos = net.minecraft.util.math.ChunkPos.func_77272_a(tilePos.func_177958_n() >> 4, tilePos.func_177952_p() >> 4);
+ return this.tileEntitiesChunkToBeRemoved.contains(tileChunkPos);
+ };
+ java.util.function.Predicate<TileEntity> isInChunkDoUnload = (tileEntity) ->
+ {
+ boolean inChunk = isInChunk.test(tileEntity);
+ if (inChunk)
+ {
+ tileEntity.onChunkUnload();
+ }
+ return inChunk;
+ };
+ this.field_175730_i.removeIf(isInChunk);
+ this.field_147482_g.removeIf(isInChunkDoUnload);
+ this.tileEntitiesChunkToBeRemoved.clear();
+ } + }
+ } + }
+ +

32
patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch
View file

@ -157,7 +157,7 @@
{ {
if (this.field_150816_i.containsKey(p_177426_1_)) if (this.field_150816_i.containsKey(p_177426_1_))
{ {
@@ -854,14 +854,17 @@ @@ -854,8 +854,9 @@
for (ClassInheritanceMultiMap<Entity> classinheritancemultimap : this.field_76645_j) for (ClassInheritanceMultiMap<Entity> classinheritancemultimap : this.field_76645_j)
{ {
@ -168,15 +168,7 @@
} }
public void func_76623_d() public void func_76623_d()
{ @@ -871,6 +872,7 @@
this.field_76636_d = false;
+ this.field_76637_e.markTileEntitiesInChunkForRemoval(this);
+ if (false) // Forge: remove all TEs in a chunk at once instead of marking each one for removal
for (TileEntity tileentity : this.field_150816_i.values())
{
this.field_76637_e.func_147457_a(tileentity);
@@ -871,6 +874,7 @@
{ {
this.field_76637_e.func_175681_c(classinheritancemultimap); this.field_76637_e.func_175681_c(classinheritancemultimap);
} }
@ -184,7 +176,7 @@
} }
public void func_76630_e() public void func_76630_e()
@@ -880,8 +884,8 @@ @@ -880,8 +882,8 @@
public void func_177414_a(@Nullable Entity p_177414_1_, AxisAlignedBB p_177414_2_, List<Entity> p_177414_3_, Predicate <? super Entity > p_177414_4_) public void func_177414_a(@Nullable Entity p_177414_1_, AxisAlignedBB p_177414_2_, List<Entity> p_177414_3_, Predicate <? super Entity > p_177414_4_)
{ {
@ -195,7 +187,7 @@
i = MathHelper.func_76125_a(i, 0, this.field_76645_j.length - 1); i = MathHelper.func_76125_a(i, 0, this.field_76645_j.length - 1);
j = MathHelper.func_76125_a(j, 0, this.field_76645_j.length - 1); j = MathHelper.func_76125_a(j, 0, this.field_76645_j.length - 1);
@@ -918,8 +922,8 @@ @@ -918,8 +920,8 @@
public <T extends Entity> void func_177430_a(Class <? extends T > p_177430_1_, AxisAlignedBB p_177430_2_, List<T> p_177430_3_, Predicate <? super T > p_177430_4_) public <T extends Entity> void func_177430_a(Class <? extends T > p_177430_1_, AxisAlignedBB p_177430_2_, List<T> p_177430_3_, Predicate <? super T > p_177430_4_)
{ {
@ -206,7 +198,7 @@
i = MathHelper.func_76125_a(i, 0, this.field_76645_j.length - 1); i = MathHelper.func_76125_a(i, 0, this.field_76645_j.length - 1);
j = MathHelper.func_76125_a(j, 0, this.field_76645_j.length - 1); j = MathHelper.func_76125_a(j, 0, this.field_76645_j.length - 1);
@@ -997,6 +1001,8 @@ @@ -997,6 +999,8 @@
protected void func_186034_a(IChunkGenerator p_186034_1_) protected void func_186034_a(IChunkGenerator p_186034_1_)
{ {
@ -215,7 +207,7 @@
if (this.func_177419_t()) if (this.func_177419_t())
{ {
if (p_186034_1_.func_185933_a(this, this.field_76635_g, this.field_76647_h)) if (p_186034_1_.func_185933_a(this, this.field_76635_g, this.field_76647_h))
@@ -1008,8 +1014,10 @@ @@ -1008,8 +1012,10 @@
{ {
this.func_150809_p(); this.func_150809_p();
p_186034_1_.func_185931_b(this.field_76635_g, this.field_76647_h); p_186034_1_.func_185931_b(this.field_76635_g, this.field_76647_h);
@ -226,7 +218,7 @@
} }
public BlockPos func_177440_h(BlockPos p_177440_1_) public BlockPos func_177440_h(BlockPos p_177440_1_)
@@ -1064,7 +1072,7 @@ @@ -1064,7 +1070,7 @@
{ {
BlockPos blockpos = this.field_177447_w.poll(); BlockPos blockpos = this.field_177447_w.poll();
@ -235,7 +227,7 @@
{ {
TileEntity tileentity = this.func_177422_i(blockpos); TileEntity tileentity = this.func_177422_i(blockpos);
this.field_76637_e.func_175690_a(blockpos, tileentity); this.field_76637_e.func_175690_a(blockpos, tileentity);
@@ -1128,6 +1136,13 @@ @@ -1128,6 +1134,13 @@
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void func_186033_a(PacketBuffer p_186033_1_, int p_186033_2_, boolean p_186033_3_) public void func_186033_a(PacketBuffer p_186033_1_, int p_186033_2_, boolean p_186033_3_)
{ {
@ -249,7 +241,7 @@
boolean flag = this.field_76637_e.field_73011_w.func_191066_m(); boolean flag = this.field_76637_e.field_73011_w.func_191066_m();
for (int i = 0; i < this.field_76652_q.length; ++i) for (int i = 0; i < this.field_76652_q.length; ++i)
@@ -1176,10 +1191,16 @@ @@ -1176,10 +1189,16 @@
this.field_76646_k = true; this.field_76646_k = true;
this.func_76590_a(); this.func_76590_a();
@ -266,7 +258,7 @@
} }
public Biome func_177411_a(BlockPos p_177411_1_, BiomeProvider p_177411_2_) public Biome func_177411_a(BlockPos p_177411_1_, BiomeProvider p_177411_2_)
@@ -1244,13 +1265,13 @@ @@ -1244,13 +1263,13 @@
BlockPos blockpos1 = blockpos.func_177982_a(k, (j << 4) + i1, l); BlockPos blockpos1 = blockpos.func_177982_a(k, (j << 4) + i1, l);
boolean flag = i1 == 0 || i1 == 15 || k == 0 || k == 15 || l == 0 || l == 15; boolean flag = i1 == 0 || i1 == 15 || k == 0 || k == 15 || l == 0 || l == 15;
@ -282,7 +274,7 @@
{ {
this.field_76637_e.func_175664_x(blockpos2); this.field_76637_e.func_175664_x(blockpos2);
} }
@@ -1381,7 +1402,7 @@ @@ -1381,7 +1400,7 @@
{ {
blockpos$mutableblockpos.func_181079_c(blockpos$mutableblockpos.func_177958_n(), l, blockpos$mutableblockpos.func_177952_p()); blockpos$mutableblockpos.func_181079_c(blockpos$mutableblockpos.func_177958_n(), l, blockpos$mutableblockpos.func_177952_p());
@ -291,7 +283,7 @@
{ {
this.field_76637_e.func_175664_x(blockpos$mutableblockpos); this.field_76637_e.func_175664_x(blockpos$mutableblockpos);
} }
@@ -1489,4 +1510,34 @@ @@ -1489,4 +1508,34 @@
QUEUED, QUEUED,
CHECK; CHECK;
} }