diff --git a/fml b/fml index 1112c455b..6edc1635d 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 1112c455b9758c38eab385f48578bad17c0180f9 +Subproject commit 6edc1635de163c41b6b5dfe02bee13d6a9c5aa4d diff --git a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch index 365c39477..b3d3008cd 100644 --- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch +++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java +++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java -@@ -195,6 +195,8 @@ +@@ -196,6 +196,8 @@ import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.MapData; import net.minecraft.world.storage.MapStorage; @@ -9,7 +9,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -389,7 +391,8 @@ +@@ -390,7 +392,8 @@ public void func_147286_a(S11PacketSpawnExperienceOrb p_147286_1_) { @@ -19,7 +19,7 @@ entityxporb.field_70118_ct = p_147286_1_.func_148984_d(); entityxporb.field_70117_cu = p_147286_1_.func_148983_e(); entityxporb.field_70116_cv = p_147286_1_.func_148982_f(); -@@ -686,7 +689,11 @@ +@@ -687,7 +690,11 @@ public void func_147251_a(S02PacketChat p_147251_1_) { @@ -32,7 +32,7 @@ } public void func_147279_a(S0BPacketAnimation p_147279_1_) -@@ -1126,6 +1133,10 @@ +@@ -1127,6 +1134,10 @@ { tileentity.func_145839_a(p_147273_1_.func_148857_g()); } diff --git a/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch index 0f030973a..a959f9dc0 100644 --- a/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch +++ b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java +++ ../src-work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java -@@ -55,11 +55,15 @@ +@@ -55,12 +55,15 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import net.minecraft.util.MathHelper; @@ -11,12 +11,12 @@ import net.minecraft.world.WorldSettings; import net.minecraft.world.demo.DemoWorldManager; import net.minecraft.world.storage.IPlayerFileData; + import net.minecraft.world.storage.SaveHandler; +import net.minecraftforge.common.chunkio.ChunkIOExecutor; -+ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -108,7 +112,17 @@ +@@ -109,7 +112,17 @@ String s = gameprofile1 == null ? gameprofile.getName() : gameprofile1.getName(); playerprofilecache.func_152649_a(gameprofile); NBTTagCompound nbttagcompound = this.func_72380_a(p_72355_2_); @@ -35,7 +35,7 @@ p_72355_2_.field_71134_c.func_73080_a((WorldServer)p_72355_2_.field_70170_p); String s1 = "local"; -@@ -242,6 +256,7 @@ +@@ -243,6 +256,7 @@ p_72380_1_.func_70020_e(nbttagcompound); nbttagcompound1 = nbttagcompound; field_148546_d.debug("loading single player"); @@ -43,7 +43,7 @@ } else { -@@ -269,6 +284,7 @@ +@@ -283,6 +297,7 @@ this.func_148540_a(new S38PacketPlayerListItem(p_72377_1_.func_70005_c_(), true, 1000)); this.field_72404_b.add(p_72377_1_); WorldServer worldserver = this.field_72400_f.func_71218_a(p_72377_1_.field_71093_bK); @@ -51,7 +51,7 @@ worldserver.func_72838_d(p_72377_1_); this.func_72375_a(p_72377_1_, (WorldServer)null); -@@ -301,6 +317,7 @@ +@@ -315,6 +330,7 @@ worldserver.func_73040_p().func_72695_c(p_72367_1_); this.field_72404_b.remove(p_72367_1_); this.field_148547_k.remove(p_72367_1_.func_110124_au()); @@ -59,7 +59,7 @@ this.func_148540_a(new S38PacketPlayerListItem(p_72367_1_.func_70005_c_(), false, 9999)); } -@@ -382,13 +399,23 @@ +@@ -396,13 +412,23 @@ public EntityPlayerMP func_72368_a(EntityPlayerMP p_72368_1_, int p_72368_2_, boolean p_72368_3_) { @@ -85,7 +85,7 @@ p_72368_1_.field_71093_bK = p_72368_2_; Object object; -@@ -404,6 +431,7 @@ +@@ -418,6 +444,7 @@ EntityPlayerMP entityplayermp1 = new EntityPlayerMP(this.field_72400_f, this.field_72400_f.func_71218_a(p_72368_1_.field_71093_bK), p_72368_1_.func_146103_bH(), (ItemInWorldManager)object); entityplayermp1.field_71135_a = p_72368_1_.field_71135_a; entityplayermp1.func_71049_a(p_72368_1_, p_72368_3_); @@ -93,7 +93,7 @@ entityplayermp1.func_145769_d(p_72368_1_.func_145782_y()); WorldServer worldserver = this.field_72400_f.func_71218_a(p_72368_1_.field_71093_bK); this.func_72381_a(entityplayermp1, p_72368_1_, worldserver); -@@ -448,14 +476,19 @@ +@@ -462,14 +489,19 @@ public void func_72356_a(EntityPlayerMP p_72356_1_, int p_72356_2_) { @@ -115,7 +115,7 @@ this.func_72375_a(p_72356_1_, worldserver); p_72356_1_.field_71135_a.func_147364_a(p_72356_1_.field_70165_t, p_72356_1_.field_70163_u, p_72356_1_.field_70161_v, p_72356_1_.field_70177_z, p_72356_1_.field_70125_A); p_72356_1_.field_71134_c.func_73080_a(worldserver1); -@@ -473,38 +506,47 @@ +@@ -487,38 +519,47 @@ public void func_82448_a(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_) { @@ -175,7 +175,7 @@ { ChunkCoordinates chunkcoordinates; -@@ -539,7 +581,7 @@ +@@ -553,7 +594,7 @@ if (p_82448_1_.func_70089_S()) { p_82448_1_.func_70012_b(d0, p_82448_1_.field_70163_u, d1, p_82448_1_.field_70177_z, p_82448_1_.field_70125_A); diff --git a/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch b/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch index a265ec02f..3e8518a0f 100644 --- a/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch +++ b/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/storage/SaveHandler.java +++ ../src-work/minecraft/net/minecraft/world/storage/SaveHandler.java -@@ -254,6 +254,7 @@ +@@ -256,6 +256,7 @@ } file1.renameTo(file2); @@ -8,7 +8,7 @@ } catch (Exception exception) { -@@ -284,6 +285,7 @@ +@@ -286,6 +287,7 @@ p_75752_1_.func_70020_e(nbttagcompound); }