mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 04:32:15 +00:00
Vanilla/mod bug fixes: CME on entity processing, TileEntity resetting chunk on save/load.
This commit is contained in:
1 parent
b23081df78
commit
a7eb5dc773
6 files changed
+140
-8
No files matched your search
@@ -1,6 +1,45 @@
|
||||
--- ../src-base/common/net/minecraft/src/World.java
|
||||
+++ ../src-work/common/net/minecraft/src/World.java
|
||||
@@ -3475,7 +3475,7 @@
|
||||
@@ -10,6 +10,8 @@
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
+
|
||||
+import com.google.common.collect.ImmutableList;
|
||||
|
||||
public abstract class World implements IBlockAccess
|
||||
{
|
||||
@@ -1552,8 +1554,9 @@
|
||||
}
|
||||
|
||||
this.field_72984_F.func_76318_c("remove");
|
||||
- this.field_72996_f.removeAll(this.field_72997_g);
|
||||
- Iterator var5 = this.field_72997_g.iterator();
|
||||
+ List fml_entitiesToRemove = ImmutableList.copyOf(this.field_72997_g);
|
||||
+ this.field_72996_f.removeAll(fml_entitiesToRemove);
|
||||
+ Iterator var5 = fml_entitiesToRemove.iterator();
|
||||
int var3;
|
||||
int var4;
|
||||
|
||||
@@ -1569,7 +1572,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- var5 = this.field_72997_g.iterator();
|
||||
+ var5 = fml_entitiesToRemove.iterator();
|
||||
|
||||
while (var5.hasNext())
|
||||
{
|
||||
@@ -1577,7 +1580,7 @@
|
||||
this.func_72847_b(var2);
|
||||
}
|
||||
|
||||
- this.field_72997_g.clear();
|
||||
+ this.field_72997_g.removeAll(fml_entitiesToRemove);
|
||||
this.field_72984_F.func_76318_c("regular");
|
||||
|
||||
for (var1 = 0; var1 < this.field_72996_f.size(); ++var1)
|
||||
@@ -3475,7 +3478,7 @@
|
||||
@SideOnly(Side.CLIENT)
|
||||
public double func_72919_O()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user