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

Fixed issue with WorldServer.getTileEntities when being called with ranges that overlap chunks oddly. Closes #2350

Browse source
This commit is contained in:
LexManos 2016-01-08 14:42:29 -08:00
parent 5c5d946ff5
commit c78a7ce41e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,13 +133,13 @@
- for (int i = 0; i < this.field_147482_g.size(); ++i)
+ //Forge: Optimize this loop to only grab from the chunks it needs
+ for (int x = p_147486_1_; x < p_147486_4_; x += 16)
+ for (int x = (p_147486_1_ & ~0x0F); x < p_147486_4_; x += 16)
{
- TileEntity tileentity = (TileEntity)this.field_147482_g.get(i);
- BlockPos blockpos = tileentity.func_174877_v();
-
- if (blockpos.func_177958_n() >= p_147486_1_ && blockpos.func_177956_o() >= p_147486_2_ && blockpos.func_177952_p() >= p_147486_3_ && blockpos.func_177958_n() < p_147486_4_ && blockpos.func_177956_o() < p_147486_5_ && blockpos.func_177952_p() < p_147486_6_)
+ for (int z = p_147486_3_; z < p_147486_6_; z += 16)
+ for (int z = (p_147486_3_ & ~0x0F); z < p_147486_6_; z += 16) // & ~0xF Floors it by 16. Yay bitmath!
{
- list.add(tileentity);
+ if (!this.func_175680_a(x >> 4, z >> 4, true)) continue; //Prevent loading extra chunks to just read data. This causes orphaned chunks that never unload.