From 9acdb5b6200bba7a1b8968438503f551edbcb262 Mon Sep 17 00:00:00 2001
From: Eloraam <eloraam@eloraam.com>
Date: Mon, 12 Mar 2012 15:51:11 -0400
Subject: [PATCH] Fixed a merge error.

---
 forge/conf/patches/gh.java                    | 20 +++----
 .../src/forge/IChunkLoadHandler.java          | 52 +++++++++----------
 .../minecraft/src/NetServerHandler.java.patch |  1 -
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/forge/conf/patches/gh.java b/forge/conf/patches/gh.java
index a2cb9d9c5..f7bb1e6a7 100644
--- a/forge/conf/patches/gh.java
+++ b/forge/conf/patches/gh.java
@@ -1,10 +1,10 @@
-// this is needed for the sound engine to work with deobfuscated sourcecode without crashing
-
-public class gh
-{
-    public static int c(double d)
-    {
-        int i = (int)d;
-        return d >= (double)i ? i : i - 1;
-    }
-}
+// this is needed for the sound engine to work with deobfuscated sourcecode without crashing
+
+public class gh
+{
+    public static int c(double d)
+    {
+        int i = (int)d;
+        return d >= (double)i ? i : i - 1;
+    }
+}
diff --git a/forge/forge_common/net/minecraft/src/forge/IChunkLoadHandler.java b/forge/forge_common/net/minecraft/src/forge/IChunkLoadHandler.java
index daf858014..f0d5bf7bd 100644
--- a/forge/forge_common/net/minecraft/src/forge/IChunkLoadHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IChunkLoadHandler.java
@@ -1,27 +1,27 @@
-package net.minecraft.src.forge;
-
-import java.util.Set;
-import net.minecraft.src.Chunk;
-import net.minecraft.src.ChunkCoordIntPair;
-import net.minecraft.src.World;
-
-/**
- * Register an implementation of this interface to be used for chunk load handling.
- */
-public interface IChunkLoadHandler
-{
-    /**
-     * Called from World.tickBlocksAndAmbiance
-     * Add loaded chunks to this set for them to receive block tick updates
-     * @param world The world containing the chunks
-     * @param chunkList The set of active chunks
-     */
-    public void addActiveChunks(World world, Set<ChunkCoordIntPair> chunkList);
-
-    /**
-     * Called from ChunkProvider.dropChunk
-     * Return false to prevent the unloading of this chunk
-     * @param chunk The chunk to be unloaded
-     */
-    public boolean canUnloadChunk(Chunk chunk);
+package net.minecraft.src.forge;
+
+import java.util.Set;
+import net.minecraft.src.Chunk;
+import net.minecraft.src.ChunkCoordIntPair;
+import net.minecraft.src.World;
+
+/**
+ * Register an implementation of this interface to be used for chunk load handling.
+ */
+public interface IChunkLoadHandler
+{
+    /**
+     * Called from World.tickBlocksAndAmbiance
+     * Add loaded chunks to this set for them to receive block tick updates
+     * @param world The world containing the chunks
+     * @param chunkList The set of active chunks
+     */
+    public void addActiveChunks(World world, Set<ChunkCoordIntPair> chunkList);
+
+    /**
+     * Called from ChunkProvider.dropChunk
+     * Return false to prevent the unloading of this chunk
+     * @param chunk The chunk to be unloaded
+     */
+    public boolean canUnloadChunk(Chunk chunk);
 }
\ No newline at end of file
diff --git a/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch b/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
index 077c75472..6857cac8e 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
@@ -56,7 +56,6 @@
      }
  
 @@ -960,4 +966,49 @@
->>>>>>> MCP Update.  Fixed a few small bugs in the linux scripts.
      {
          return true;
      }