diff --git a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java index d67679d77..1c579ab90 100644 --- a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java +++ b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java @@ -22,7 +22,6 @@ import java.util.logging.Logger; import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; -import net.minecraft.dispenser.BehaviorSnowballDispense; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -31,7 +30,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.NetHandler; import net.minecraft.network.packet.Packet131MapData; -import net.minecraft.server.*; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.ServerListenThread; +import net.minecraft.server.ThreadMinecraftServer; import net.minecraft.server.dedicated.DedicatedServer; import net.minecraft.world.World; import net.minecraft.world.storage.SaveHandler; @@ -178,8 +179,7 @@ public class FMLCommonHandler public Side getEffectiveSide() { Thread thr = Thread.currentThread(); - // totally temporary! - if ((thr instanceof BehaviorSnowballDispense) || (thr instanceof ServerListenThread)) + if ((thr instanceof ThreadMinecraftServer) || (thr instanceof ServerListenThread)) { return Side.SERVER; } diff --git a/fml/conf/joined.exc b/fml/conf/joined.exc index a6806d6a9..eb6dde146 100644 --- a/fml/conf/joined.exc +++ b/fml/conf/joined.exc @@ -4319,11 +4319,11 @@ net/minecraft/src/BanList.func_73704_a(Ljava/lang/String;)Z=|p_73704_1_ net/minecraft/src/BanList.func_73706_a(Lnet/minecraft/src/BanEntry;)V=|p_73706_1_ net/minecraft/src/BanList.func_73708_a(Z)V=|p_73708_1_ net/minecraft/src/BanList.func_73709_b(Ljava/lang/String;)V=|p_73709_1_ -net/minecraft/src/BehaviorArrowDispense.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5002_1_ -net/minecraft/src/BehaviorArrowDispense.func_73718_a(I)V=|p_73718_1_ -net/minecraft/src/BehaviorArrowDispense.func_73719_c(Ljava/lang/String;)V=|p_73719_1_ -net/minecraft/src/BehaviorArrowDispense.func_73720_a(Ljava/lang/String;)V=|p_73720_1_ -net/minecraft/src/BehaviorArrowDispense.func_73721_b(Ljava/lang/String;)V=|p_73721_1_ +net/minecraft/src/ConvertingProgressUpdate.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5002_1_ +net/minecraft/src/ConvertingProgressUpdate.func_73718_a(I)V=|p_73718_1_ +net/minecraft/src/ConvertingProgressUpdate.func_73719_c(Ljava/lang/String;)V=|p_73719_1_ +net/minecraft/src/ConvertingProgressUpdate.func_73720_a(Ljava/lang/String;)V=|p_73720_1_ +net/minecraft/src/ConvertingProgressUpdate.func_73721_b(Ljava/lang/String;)V=|p_73721_1_ net/minecraft/src/BehaviorDefaultDispenseItem.func_82482_a(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82482_1_,p_82482_2_ net/minecraft/src/BehaviorDefaultDispenseItem.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_ net/minecraft/src/BehaviorDefaultDispenseItem.func_82486_a(Lnet/minecraft/src/World;Lnet/minecraft/src/ItemStack;ILnet/minecraft/src/EnumFacing;Lnet/minecraft/src/IPosition;)V=|p_82486_0_,p_82486_1_,p_82486_2_,p_82486_3_,p_82486_4_ @@ -4334,14 +4334,14 @@ net/minecraft/src/BehaviorDispenseArmor.func_82487_b(Lnet/minecraft/src/IBlockSo net/minecraft/src/BehaviorDispenseItemProvider.func_82482_a(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82482_1_,p_82482_2_ net/minecraft/src/BehaviorDispenseMinecart.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_ net/minecraft/src/BehaviorDispenseMinecart.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ -net/minecraft/src/BehaviorEggDispense.(Lnet/minecraft/src/DedicatedServer;)V=|p_i10010_1_ -net/minecraft/src/BehaviorEggDispense.run()V=| -net/minecraft/src/BehaviorExpBottleDispense.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5006_1_ -net/minecraft/src/BehaviorMobEggDispense.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5009_1_ -net/minecraft/src/BehaviorPotionDispense.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5008_1_ +net/minecraft/src/ThreadDedicatedServer.(Lnet/minecraft/src/DedicatedServer;)V=|p_i10010_1_ +net/minecraft/src/ThreadDedicatedServer.run()V=| +net/minecraft/src/CallableIsServerModded.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5006_1_ +net/minecraft/src/CallableServerMemoryStats.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5009_1_ +net/minecraft/src/CallableServerProfiler.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5008_1_ net/minecraft/src/BehaviorProjectileDispense.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_ net/minecraft/src/BehaviorProjectileDispense.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ -net/minecraft/src/BehaviorSnowballDispense.(Lnet/minecraft/server/MinecraftServer;Ljava/lang/String;)V=|p_i10043_1_,p_i10043_2_ +net/minecraft/src/ThreadMinecraftServer.(Lnet/minecraft/server/MinecraftServer;Ljava/lang/String;)V=|p_i10043_1_,p_i10043_2_ net/minecraft/src/BiomeCache.(Lnet/minecraft/src/WorldChunkManager;)V=|p_i3749_1_ net/minecraft/src/BiomeCache.func_76836_a(Lnet/minecraft/src/BiomeCache;)Lnet/minecraft/src/WorldChunkManager;=|p_76836_0_ net/minecraft/src/BiomeCache.func_76837_b(II)Lnet/minecraft/src/BiomeGenBase;=|p_76837_1_,p_76837_2_ @@ -11119,10 +11119,10 @@ net/minecraft/src/TileEntity.func_70315_b(II)V=|p_70315_1_,p_70315_2_ net/minecraft/src/TileEntity.func_70317_c(Lnet/minecraft/src/NBTTagCompound;)Lnet/minecraft/src/TileEntity;=|p_70317_0_ net/minecraft/src/TileEntity.func_70318_a(DDD)D=|p_70318_1_,p_70318_3_,p_70318_5_ net/minecraft/src/TileEntity.func_85027_a(Lnet/minecraft/src/CrashReportCategory;)V=|p_85027_1_ -net/minecraft/src/TileEntityBase.(ILnet/minecraft/src/Material;)V=|p_i10059_1_,p_i10059_2_ -net/minecraft/src/TileEntityBase.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_71852_1_,p_71852_2_,p_71852_3_,p_71852_4_,p_71852_5_,p_71852_6_ -net/minecraft/src/TileEntityBase.func_71861_g(Lnet/minecraft/src/World;III)V=|p_71861_1_,p_71861_2_,p_71861_3_,p_71861_4_ -net/minecraft/src/TileEntityBase.func_71883_b(Lnet/minecraft/src/World;IIIII)V=|p_71883_1_,p_71883_2_,p_71883_3_,p_71883_4_,p_71883_5_,p_71883_6_ +net/minecraft/src/BlockContainer.(ILnet/minecraft/src/Material;)V=|p_i10059_1_,p_i10059_2_ +net/minecraft/src/BlockContainer.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_71852_1_,p_71852_2_,p_71852_3_,p_71852_4_,p_71852_5_,p_71852_6_ +net/minecraft/src/BlockContainer.func_71861_g(Lnet/minecraft/src/World;III)V=|p_71861_1_,p_71861_2_,p_71861_3_,p_71861_4_ +net/minecraft/src/BlockContainer.func_71883_b(Lnet/minecraft/src/World;IIIII)V=|p_71883_1_,p_71883_2_,p_71883_3_,p_71883_4_,p_71883_5_,p_71883_6_ net/minecraft/src/TileEntityBeacon.func_70298_a(II)Lnet/minecraft/src/ItemStack;=|p_70298_1_,p_70298_2_ net/minecraft/src/TileEntityBeacon.func_70299_a(ILnet/minecraft/src/ItemStack;)V=|p_70299_1_,p_70299_2_ net/minecraft/src/TileEntityBeacon.func_70300_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_70300_1_ diff --git a/fml/conf/joined.srg b/fml/conf/joined.srg index 5dbf463b9..301250042 100644 --- a/fml/conf/joined.srg +++ b/fml/conf/joined.srg @@ -247,7 +247,7 @@ CL: akd net/minecraft/src/MapStorage CL: ake net/minecraft/src/ThreadedFileIOBase CL: akf net/minecraft/src/IThreadedFileIO CL: akh net/minecraft/src/BlockAnvil -CL: aki net/minecraft/src/TileEntityBase +CL: aki net/minecraft/src/BlockContainer CL: akj net/minecraft/src/BlockBasePressurePlate CL: akk net/minecraft/src/BlockRailBase CL: akl net/minecraft/src/BlockBaseRailLogic @@ -281,7 +281,7 @@ CL: alm net/minecraft/src/BlockDropper CL: aln net/minecraft/src/BlockDragonEgg CL: alo net/minecraft/src/BlockEnchantmentTable CL: alp net/minecraft/src/BlockEnderChest -CL: alq net/minecraft/src/BlockContainer +CL: alq net/minecraft/src/ITileEntityProvider CL: alr net/minecraft/src/BlockFarmland CL: als net/minecraft/src/BlockFenceGate CL: alt net/minecraft/src/BlockFence @@ -1030,12 +1030,12 @@ CL: gj net/minecraft/src/DispenserBehaviorFireball CL: gk net/minecraft/src/DispenserBehaviorBoat CL: gl net/minecraft/src/ConsoleLogManager CL: gm net/minecraft/src/ConsoleLogFormatter -CL: gn net/minecraft/src/BehaviorArrowDispense -CL: go net/minecraft/src/BehaviorEggDispense -CL: gp net/minecraft/src/BehaviorSnowballDispense -CL: gq net/minecraft/src/BehaviorExpBottleDispense -CL: gr net/minecraft/src/BehaviorPotionDispense -CL: gs net/minecraft/src/BehaviorMobEggDispense +CL: gn net/minecraft/src/ConvertingProgressUpdate +CL: go net/minecraft/src/ThreadDedicatedServer +CL: gp net/minecraft/src/ThreadMinecraftServer +CL: gq net/minecraft/src/CallableIsServerModded +CL: gr net/minecraft/src/CallableServerProfiler +CL: gs net/minecraft/src/CallableServerMemoryStats CL: gt net/minecraft/src/PlayerPositionComparator CL: gu net/minecraft/src/ServerConfigurationManager CL: gv net/minecraft/src/IServer @@ -5286,13 +5286,13 @@ FD: gg/c net/minecraft/src/DispenserBehaviorPotionProjectile/field_96463_c FD: gk/b net/minecraft/src/DispenserBehaviorBoat/field_96464_b FD: gl/a net/minecraft/src/ConsoleLogManager/field_73700_a FD: gm/a net/minecraft/src/ConsoleLogFormatter/field_74268_a -FD: gn/a net/minecraft/src/BehaviorArrowDispense/field_74267_a -FD: gn/b net/minecraft/src/BehaviorArrowDispense/field_96245_b -FD: go/a net/minecraft/src/BehaviorEggDispense/field_96244_a -FD: gp/a net/minecraft/src/BehaviorSnowballDispense/field_73716_a -FD: gq/a net/minecraft/src/BehaviorExpBottleDispense/field_74274_a -FD: gr/a net/minecraft/src/BehaviorPotionDispense/field_74272_a -FD: gs/a net/minecraft/src/BehaviorMobEggDispense/field_74270_a +FD: gn/a net/minecraft/src/ConvertingProgressUpdate/field_74267_a +FD: gn/b net/minecraft/src/ConvertingProgressUpdate/field_96245_b +FD: go/a net/minecraft/src/ThreadDedicatedServer/field_96244_a +FD: gp/a net/minecraft/src/ThreadMinecraftServer/field_73716_a +FD: gq/a net/minecraft/src/CallableIsServerModded/field_74274_a +FD: gr/a net/minecraft/src/CallableServerProfiler/field_74272_a +FD: gs/a net/minecraft/src/CallableServerMemoryStats/field_74270_a FD: gt/a net/minecraft/src/PlayerPositionComparator/field_82548_a FD: gu/a net/minecraft/src/ServerConfigurationManager/field_72406_a FD: gu/b net/minecraft/src/ServerConfigurationManager/field_72404_b @@ -8474,9 +8474,9 @@ MD: akh/a_ (Lzk;IIII)V net/minecraft/src/BlockAnvil/func_82519_a_ (Lnet/minecraf MD: akh/b ()Z net/minecraft/src/BlockAnvil/func_71886_c ()Z MD: akh/c ()Z net/minecraft/src/BlockAnvil/func_71926_d ()Z MD: akh/d ()I net/minecraft/src/BlockAnvil/func_71857_b ()I -MD: aki/a (Lzk;III)V net/minecraft/src/TileEntityBase/func_71861_g (Lnet/minecraft/src/World;III)V -MD: aki/a (Lzk;IIIII)V net/minecraft/src/TileEntityBase/func_71852_a (Lnet/minecraft/src/World;IIIII)V -MD: aki/b (Lzk;IIIII)V net/minecraft/src/TileEntityBase/func_71883_b (Lnet/minecraft/src/World;IIIII)V +MD: aki/a (Lzk;III)V net/minecraft/src/BlockContainer/func_71861_g (Lnet/minecraft/src/World;III)V +MD: aki/a (Lzk;IIIII)V net/minecraft/src/BlockContainer/func_71852_a (Lnet/minecraft/src/World;IIIII)V +MD: aki/b (Lzk;IIIII)V net/minecraft/src/BlockContainer/func_71883_b (Lnet/minecraft/src/World;IIIII)V MD: akj/a (III)Laqg; net/minecraft/src/BlockBasePressurePlate/func_94352_a (III)Lnet/minecraft/src/AxisAlignedBB; MD: akj/a (Lls;)V net/minecraft/src/BlockBasePressurePlate/func_94332_a (Lnet/minecraft/src/IconRegister;)V MD: akj/a (Lzk;)I net/minecraft/src/BlockBasePressurePlate/func_71859_p_ (Lnet/minecraft/src/World;)I @@ -8882,7 +8882,7 @@ MD: alp/b (Lzk;IIILjava/util/Random;)V net/minecraft/src/BlockEnderChest/func_71 MD: alp/c ()Z net/minecraft/src/BlockEnderChest/func_71926_d ()Z MD: alp/d ()I net/minecraft/src/BlockEnderChest/func_71857_b ()I MD: alp/r_ ()Z net/minecraft/src/BlockEnderChest/func_71906_q_ ()Z -MD: alq/b (Lzk;)Lapy; net/minecraft/src/BlockContainer/func_72274_a (Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity; +MD: alq/b (Lzk;)Lapy; net/minecraft/src/ITileEntityProvider/func_72274_a (Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity; MD: alr/a (II)Llr; net/minecraft/src/BlockFarmland/func_71858_a (II)Lnet/minecraft/src/Icon; MD: alr/a (ILjava/util/Random;I)I net/minecraft/src/BlockFarmland/func_71885_a (ILjava/util/Random;I)I MD: alr/a (Lls;)V net/minecraft/src/BlockFarmland/func_94332_a (Lnet/minecraft/src/IconRegister;)V @@ -13603,19 +13603,19 @@ MD: gk/a (Lay;)V net/minecraft/src/DispenserBehaviorBoat/func_82485_a (Lnet/mine MD: gk/b (Lay;Lvx;)Lvx; net/minecraft/src/DispenserBehaviorBoat/func_82487_b (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack; MD: gl/a ()V net/minecraft/src/ConsoleLogManager/func_73699_a ()V MD: gm/format (Ljava/util/logging/LogRecord;)Ljava/lang/String; net/minecraft/src/ConsoleLogFormatter/format (Ljava/util/logging/LogRecord;)Ljava/lang/String; -MD: gn/a ()V net/minecraft/src/BehaviorArrowDispense/func_73717_a ()V -MD: gn/a (I)V net/minecraft/src/BehaviorArrowDispense/func_73718_a (I)V -MD: gn/a (Ljava/lang/String;)V net/minecraft/src/BehaviorArrowDispense/func_73720_a (Ljava/lang/String;)V -MD: gn/b (Ljava/lang/String;)V net/minecraft/src/BehaviorArrowDispense/func_73721_b (Ljava/lang/String;)V -MD: gn/c (Ljava/lang/String;)V net/minecraft/src/BehaviorArrowDispense/func_73719_c (Ljava/lang/String;)V -MD: go/run ()V net/minecraft/src/BehaviorEggDispense/run ()V -MD: gp/run ()V net/minecraft/src/BehaviorSnowballDispense/run ()V -MD: gq/a ()Ljava/lang/String; net/minecraft/src/BehaviorExpBottleDispense/func_96558_a ()Ljava/lang/String; -MD: gq/call ()Ljava/lang/Object; net/minecraft/src/BehaviorExpBottleDispense/call ()Ljava/lang/Object; -MD: gr/a ()Ljava/lang/String; net/minecraft/src/BehaviorPotionDispense/func_96557_a ()Ljava/lang/String; -MD: gr/call ()Ljava/lang/Object; net/minecraft/src/BehaviorPotionDispense/call ()Ljava/lang/Object; -MD: gs/a ()Ljava/lang/String; net/minecraft/src/BehaviorMobEggDispense/func_96556_a ()Ljava/lang/String; -MD: gs/call ()Ljava/lang/Object; net/minecraft/src/BehaviorMobEggDispense/call ()Ljava/lang/Object; +MD: gn/a ()V net/minecraft/src/ConvertingProgressUpdate/func_73717_a ()V +MD: gn/a (I)V net/minecraft/src/ConvertingProgressUpdate/func_73718_a (I)V +MD: gn/a (Ljava/lang/String;)V net/minecraft/src/ConvertingProgressUpdate/func_73720_a (Ljava/lang/String;)V +MD: gn/b (Ljava/lang/String;)V net/minecraft/src/ConvertingProgressUpdate/func_73721_b (Ljava/lang/String;)V +MD: gn/c (Ljava/lang/String;)V net/minecraft/src/ConvertingProgressUpdate/func_73719_c (Ljava/lang/String;)V +MD: go/run ()V net/minecraft/src/ThreadDedicatedServer/run ()V +MD: gp/run ()V net/minecraft/src/ThreadMinecraftServer/run ()V +MD: gq/a ()Ljava/lang/String; net/minecraft/src/CallableIsServerModded/func_96558_a ()Ljava/lang/String; +MD: gq/call ()Ljava/lang/Object; net/minecraft/src/CallableIsServerModded/call ()Ljava/lang/Object; +MD: gr/a ()Ljava/lang/String; net/minecraft/src/CallableServerProfiler/func_96557_a ()Ljava/lang/String; +MD: gr/call ()Ljava/lang/Object; net/minecraft/src/CallableServerProfiler/call ()Ljava/lang/Object; +MD: gs/a ()Ljava/lang/String; net/minecraft/src/CallableServerMemoryStats/func_96556_a ()Ljava/lang/String; +MD: gs/call ()Ljava/lang/Object; net/minecraft/src/CallableServerMemoryStats/call ()Ljava/lang/Object; MD: gt/a (Ljc;Ljc;)I net/minecraft/src/PlayerPositionComparator/func_82547_a (Lnet/minecraft/src/EntityPlayerMP;Lnet/minecraft/src/EntityPlayerMP;)I MD: gt/compare (Ljava/lang/Object;Ljava/lang/Object;)I net/minecraft/src/PlayerPositionComparator/compare (Ljava/lang/Object;Ljava/lang/Object;)I MD: gu/a ()I net/minecraft/src/ServerConfigurationManager/func_72372_a ()I diff --git a/fml/conf/packages.csv b/fml/conf/packages.csv index 62358c6ce..d6519c964 100644 --- a/fml/conf/packages.csv +++ b/fml/conf/packages.csv @@ -130,13 +130,13 @@ BlockWoodButton,net/minecraft/block BlockWoodSlab,net/minecraft/block BlockWorkbench,net/minecraft/block EnumMobType,net/minecraft/block +ITileEntityProvider,net/minecraft/block RailLogic,net/minecraft/block RedstoneUpdateInfo,net/minecraft/block StepSound,net/minecraft/block StepSoundAnvil,net/minecraft/block StepSoundSand,net/minecraft/block StepSoundStone,net/minecraft/block -TileEntityRecordPlayer,net/minecraft/block MapColor,net/minecraft/block/material Material,net/minecraft/block/material MaterialLiquid,net/minecraft/block/material @@ -1175,6 +1175,7 @@ TileEntityMobSpawner,net/minecraft/tileentity TileEntityMobSpawnerSpawnData,net/minecraft/tileentity TileEntityNote,net/minecraft/tileentity TileEntityPiston,net/minecraft/tileentity +TileEntityRecordPlayer,net/minecraft/tileentity TileEntitySign,net/minecraft/tileentity TileEntitySkull,net/minecraft/tileentity AABBLocalPool,net/minecraft/util diff --git a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index f65f6d983..d244ed32f 100644 --- a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -9,7 +9,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.awt.GraphicsEnvironment; -@@ -357,7 +360,11 @@ +@@ -351,7 +354,11 @@ { if (this.func_71197_b()) { @@ -21,7 +21,7 @@ for (long k0 = 0L; this.field_71317_u; this.field_71296_Q = true) { -@@ -396,6 +403,7 @@ +@@ -390,6 +397,7 @@ Thread.sleep(1L); } @@ -29,7 +29,7 @@ } else { -@@ -404,6 +412,10 @@ +@@ -398,6 +406,10 @@ } catch (Throwable throwable) { @@ -40,7 +40,7 @@ throwable.printStackTrace(); field_71306_a.log(Level.SEVERE, "Encountered an unexpected exception " + throwable.getClass().getSimpleName(), throwable); CrashReport crashreport = null; -@@ -434,6 +446,10 @@ +@@ -428,6 +440,10 @@ { try { @@ -51,7 +51,7 @@ this.func_71260_j(); this.field_71316_v = true; } -@@ -443,6 +459,7 @@ +@@ -437,6 +453,7 @@ } finally { @@ -59,7 +59,7 @@ this.func_71240_o(); } } -@@ -459,8 +476,10 @@ +@@ -453,8 +470,10 @@ public void func_71217_p() { @@ -70,7 +70,7 @@ ++this.field_71315_w; if (this.field_71295_T) -@@ -506,6 +525,7 @@ +@@ -500,6 +519,7 @@ this.field_71304_b.func_76319_b(); this.field_71304_b.func_76319_b(); @@ -78,7 +78,7 @@ } public void func_71190_q() -@@ -533,6 +553,7 @@ +@@ -527,6 +547,7 @@ } this.field_71304_b.func_76320_a("tick"); @@ -86,7 +86,7 @@ CrashReport crashreport; try -@@ -557,6 +578,7 @@ +@@ -551,6 +572,7 @@ throw new ReportedException(crashreport); } @@ -94,7 +94,7 @@ this.field_71304_b.func_76319_b(); this.field_71304_b.func_76320_a("tracker"); worldserver.func_73039_n().func_72788_a(); -@@ -684,7 +706,7 @@ +@@ -678,7 +700,7 @@ public String getServerModName() { @@ -103,7 +103,7 @@ } public CrashReport func_71230_b(CrashReport p_71230_1_) -@@ -1130,6 +1152,13 @@ +@@ -1124,6 +1146,13 @@ @SideOnly(Side.SERVER) public static void main(String[] p_main_0_) { diff --git a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch b/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch index b5b66ecfd..139637f35 100644 --- a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch +++ b/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch @@ -11,9 +11,9 @@ +import java.util.logging.Level; + import net.minecraft.block.Block; - import net.minecraft.block.TileEntityRecordPlayer; import net.minecraft.crash.CrashReportCategory; -@@ -81,9 +84,11 @@ + import net.minecraft.nbt.NBTTagCompound; +@@ -80,9 +83,11 @@ { TileEntity tileentity = null; @@ -26,7 +26,7 @@ if (oclass != null) { -@@ -97,7 +102,17 @@ +@@ -96,7 +101,17 @@ if (tileentity != null) {