diff --git a/patches/server/0113-Phantoms-burn-in-light.patch b/patches/server/0113-Phantoms-burn-in-light.patch index e72bf035c..b5145feaa 100644 --- a/patches/server/0113-Phantoms-burn-in-light.patch +++ b/patches/server/0113-Phantoms-burn-in-light.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Phantoms burn in light diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index ec09ec241..24ad3a4ae 100644 +index ec09ec241..d529a285e 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -13,6 +13,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { private BlockPosition d; public void setHome(BlockPosition home) { this.d = home; } public BlockPosition getHome() { return this.d; } // Purpur - OBFHELPER private EntityPhantom.AttackPhase bv; public AttackPhase getAttackPhase() { return this.bv; } // Purpur - OBFHELPER private Vec3D crystalPosition; // Purpur -+ private static final RecipeItemStack TORCH = RecipeItemStack.a(Items.torch(), Items.redstoneTorch(), Items.soulTorch()); // Purpur ++ private static final RecipeItemStack TORCH = RecipeItemStack.a(Items.torch(), Items.soulTorch()); // Purpur public EntityPhantom(EntityTypes entitytypes, World world) { super(entitytypes, world); @@ -48,7 +48,7 @@ index ec09ec241..24ad3a4ae 100644 return false; } else { diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java -index b5305eaa9..8c9582f5b 100644 +index b5305eaa9..7066c5dda 100644 --- a/src/main/java/net/minecraft/server/Items.java +++ b/src/main/java/net/minecraft/server/Items.java @@ -173,7 +173,7 @@ public class Items { @@ -60,15 +60,6 @@ index b5305eaa9..8c9582f5b 100644 public static final Item cq = a(Blocks.END_ROD, CreativeModeTab.c); public static final Item cr = a(Blocks.CHORUS_PLANT, CreativeModeTab.c); public static final Item cs = a(Blocks.CHORUS_FLOWER, CreativeModeTab.c); -@@ -203,7 +203,7 @@ public class Items { - public static final Item cQ = a(Blocks.WARPED_PRESSURE_PLATE, CreativeModeTab.d); - public static final Item cR = a(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE, CreativeModeTab.d); - public static final Item cS = a(Blocks.REDSTONE_ORE, CreativeModeTab.b); -- public static final Item cT = a((ItemBlock) (new ItemBlockWallable(Blocks.REDSTONE_TORCH, Blocks.REDSTONE_WALL_TORCH, (new Item.Info()).a(CreativeModeTab.d)))); -+ public static final Item cT = a((ItemBlock) (new ItemBlockWallable(Blocks.REDSTONE_TORCH, Blocks.REDSTONE_WALL_TORCH, (new Item.Info()).a(CreativeModeTab.d)))); public static final Item redstoneTorch() { return cT; } // Purpur - OBFHELPER - public static final Item cU = a(Blocks.SNOW, CreativeModeTab.c); - public static final Item cV = a(Blocks.ICE, CreativeModeTab.b); - public static final Item cW = a(Blocks.SNOW_BLOCK, CreativeModeTab.b); @@ -225,7 +225,7 @@ public class Items { public static final Item dm = a(Blocks.SOUL_SOIL, CreativeModeTab.b); public static final Item dn = a(Blocks.BASALT, CreativeModeTab.b);