From 0ff59e797812e995483cb6936f9374741f51ddd0 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 6 Jul 2012 09:52:21 -0400 Subject: [PATCH] Remove two places that are unpatchable now --- .../minecraft/src/ChunkProvider.java.patch | 19 ---------------- .../src/ConsoleCommandHandler.java.patch | 22 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 fml/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch delete mode 100644 fml/patches/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java.patch diff --git a/fml/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch b/fml/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch deleted file mode 100644 index c30a340e4..000000000 --- a/fml/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/src/ChunkProvider.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src-work/minecraft/net/minecraft/src/ChunkProvider.java 0000-00-00 00:00:00.000000000 -0000 -@@ -6,6 +6,8 @@ - import java.util.List; - import java.util.Set; - -+import cpw.mods.fml.client.FMLClientHandler; -+ - public class ChunkProvider implements IChunkProvider - { - private Set field_28065_a = new HashSet(); -@@ -162,6 +164,7 @@ - if (this.field_28070_c != null) - { - this.field_28070_c.func_534_a(p_534_1_, p_534_2_, p_534_3_); -+ FMLClientHandler.instance().onChunkPopulate(p_534_1_, p_534_2_, p_534_3_, field_28066_g, field_28070_c); - var4.func_1006_f(); - } - } diff --git a/fml/patches/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java.patch b/fml/patches/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java.patch deleted file mode 100644 index e73fb7b06..000000000 --- a/fml/patches/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ../src-base/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src-work/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java 0000-00-00 00:00:00.000000000 -0000 -@@ -3,6 +3,8 @@ - import java.util.Iterator; - import java.util.Set; - import java.util.logging.Logger; -+ -+import cpw.mods.fml.server.FMLServerHandler; - import net.minecraft.server.MinecraftServer; - - public class ConsoleCommandHandler -@@ -397,6 +399,10 @@ - var6.func_2_b("Ban list:" + this.func_40648_a(this.field_22116_b.func_40025_r(), ", ")); - } - } -+ else if (FMLServerHandler.instance().handleServerCommand(var2, var6.func_1_c(), var6)) -+ { -+ -+ } - else - { - field_22117_a.info("Unknown console command. Type \"help\" for help.");