mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-12 16:27:47 +00:00
51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
--- ../src-base/common/net/minecraft/src/World.java
|
|
+++ ../src-work/common/net/minecraft/src/World.java
|
|
@@ -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()
|
|
{
|
|
- return this.field_72986_A.func_76067_t() == WorldType.field_77138_c ? 0.0D : 63.0D;
|
|
+ return this.field_72986_A.func_76067_t().getHorizon(this);
|
|
}
|
|
|
|
public CrashReport func_72914_a(CrashReport p_72914_1_)
|