keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fixed a merge error.

This commit is contained in:
Eloraam 2012-03-12 15:51:11 -04:00
parent 340eede26c
commit 9acdb5b620
3 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
forge/conf/patches/gh.java
View File

@ -1,10 +1,10 @@
// this is needed for the sound engine to work with deobfuscated sourcecode without crashing // this is needed for the sound engine to work with deobfuscated sourcecode without crashing
public class gh public class gh
{ {
public static int c(double d) public static int c(double d)
{ {
int i = (int)d; int i = (int)d;
return d >= (double)i ? i : i - 1; return d >= (double)i ? i : i - 1;
} }
} }

52
forge/forge_common/net/minecraft/src/forge/IChunkLoadHandler.java
View File

@ -1,27 +1,27 @@
package net.minecraft.src.forge; package net.minecraft.src.forge;
import java.util.Set; import java.util.Set;
import net.minecraft.src.Chunk; import net.minecraft.src.Chunk;
import net.minecraft.src.ChunkCoordIntPair; import net.minecraft.src.ChunkCoordIntPair;
import net.minecraft.src.World; import net.minecraft.src.World;
/** /**
* Register an implementation of this interface to be used for chunk load handling. * Register an implementation of this interface to be used for chunk load handling.
*/ */
public interface IChunkLoadHandler public interface IChunkLoadHandler
{ {
/** /**
* Called from World.tickBlocksAndAmbiance * Called from World.tickBlocksAndAmbiance
* Add loaded chunks to this set for them to receive block tick updates * Add loaded chunks to this set for them to receive block tick updates
* @param world The world containing the chunks * @param world The world containing the chunks
* @param chunkList The set of active chunks * @param chunkList The set of active chunks
*/ */
public void addActiveChunks(World world, Set<ChunkCoordIntPair> chunkList); public void addActiveChunks(World world, Set<ChunkCoordIntPair> chunkList);
/** /**
* Called from ChunkProvider.dropChunk * Called from ChunkProvider.dropChunk
* Return false to prevent the unloading of this chunk * Return false to prevent the unloading of this chunk
* @param chunk The chunk to be unloaded * @param chunk The chunk to be unloaded
*/ */
public boolean canUnloadChunk(Chunk chunk); public boolean canUnloadChunk(Chunk chunk);
} }

1
forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
View File

@ -56,7 +56,6 @@
} }
@@ -960,4 +966,49 @@ @@ -960,4 +966,49 @@
>>>>>>> MCP Update. Fixed a few small bugs in the linux scripts.
{ {
return true; return true;
} }