mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Some patches for the server
This commit is contained in:
1 parent
bc42a54a51
commit
b1ca21a161
8 files changed
+96
-9
No files matched your search
@@ -657,4 +657,9 @@ public class FMLCommonHandler
|
||||
{
|
||||
worldGenerators.add(generator);
|
||||
}
|
||||
|
||||
public void onWorldLoadTick()
|
||||
{
|
||||
tickStart(EnumSet.of(TickType.WORLDLOAD));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
--- ../src-base/minecraft/net/minecraft/src/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000
|
||||
+++ ../src-work/minecraft/net/minecraft/src/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000
|
||||
@@ -12,6 +12,8 @@
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
||||
+
|
||||
public abstract class MinecraftServer implements ICommandSender, IPlayerUsage, Runnable
|
||||
{
|
||||
public static Logger field_56394_a = Logger.getLogger("Minecraft");
|
||||
@@ -317,6 +319,8 @@
|
||||
{
|
||||
long var1 = System.currentTimeMillis();
|
||||
|
||||
+ FMLCommonHandler.instance().onWorldLoadTick();
|
||||
+
|
||||
for (long var50 = 0L; this.field_56406_t; this.field_56383_O = true)
|
||||
{
|
||||
long var5 = System.currentTimeMillis();
|
||||
@@ -0,0 +1,20 @@
|
||||
--- ../src-base/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000
|
||||
+++ ../src-work/minecraft_server/net/minecraft/server/MinecraftServer.java 0000-00-00 00:00:00.000000000 -0000
|
||||
@@ -11,6 +11,8 @@
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
+
|
||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import net.minecraft.src.AnvilSaveConverter;
|
||||
import net.minecraft.src.AxisAlignedBB;
|
||||
import net.minecraft.src.CallableMCS5;
|
||||
@@ -350,6 +352,8 @@
|
||||
{
|
||||
long var1 = System.currentTimeMillis();
|
||||
|
||||
+ FMLCommonHandler.instance().onWorldLoadTick();
|
||||
+
|
||||
for (long var50 = 0L; this.field_6025_n; this.field_56215_O = true)
|
||||
{
|
||||
long var5 = System.currentTimeMillis();
|
||||
@@ -0,0 +1,27 @@
|
||||
--- ../src-base/minecraft_server/net/minecraft/src/DedicatedServer.java 0000-00-00 00:00:00.000000000 -0000
|
||||
+++ ../src-work/minecraft_server/net/minecraft/src/DedicatedServer.java 0000-00-00 00:00:00.000000000 -0000
|
||||
@@ -8,6 +8,8 @@
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.logging.Level;
|
||||
+
|
||||
+import cpw.mods.fml.server.FMLServerHandler;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
public class DedicatedServer extends MinecraftServer implements IServer
|
||||
@@ -34,6 +36,7 @@
|
||||
var1.start();
|
||||
ConsoleLogManager.func_641_a();
|
||||
field_6038_a.info("Starting minecraft server version 12w26a");
|
||||
+ FMLServerHandler.instance().onPreLoad(this);
|
||||
|
||||
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L)
|
||||
{
|
||||
@@ -99,6 +102,7 @@
|
||||
field_6038_a.warning("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
|
||||
}
|
||||
|
||||
+ FMLServerHandler.instance().onLoadComplete();
|
||||
this.func_56197_a(new DedicatedPlayerList(this));
|
||||
long var4 = System.nanoTime();
|
||||
|
||||
@@ -1,6 +1,19 @@
|
||||
--- ../src-base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000
|
||||
+++ ../src-work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000
|
||||
@@ -105,6 +105,7 @@
|
||||
@@ -1,8 +1,12 @@
|
||||
package net.minecraft.src;
|
||||
|
||||
+import java.util.EnumSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
||||
+import cpw.mods.fml.common.TickType;
|
||||
+
|
||||
public abstract class EntityPlayer extends EntityLiving implements ICommandSender
|
||||
{
|
||||
public InventoryPlayer field_416_aj = new InventoryPlayer(this);
|
||||
@@ -105,6 +109,7 @@
|
||||
|
||||
public void func_106_b_()
|
||||
{
|
||||
@@ -8,7 +21,7 @@
|
||||
if (this.field_34908_d != null)
|
||||
{
|
||||
ItemStack var1 = this.field_416_aj.func_213_b();
|
||||
@@ -228,6 +229,7 @@
|
||||
@@ -228,6 +233,7 @@
|
||||
{
|
||||
this.field_35217_m.func_35584_a(this);
|
||||
}
|
||||
|
||||
@@ -9,13 +9,15 @@
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
public class NetServerHandler extends NetHandler
|
||||
@@ -1014,4 +1016,9 @@
|
||||
@@ -1014,4 +1016,11 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
+
|
||||
+//TODO
|
||||
+ /*
|
||||
+ @Override
|
||||
+ public void func_44001_a(Packet250CustomPayload p_44001_1_) {
|
||||
+ FMLServerHandler.instance().handlePacket250(p_44001_1_, field_16_e);
|
||||
+ }
|
||||
+ */
|
||||
}
|
||||
@@ -32,7 +32,7 @@ import net.minecraft.src.EntityItem;
|
||||
import net.minecraft.src.EntityPlayer;
|
||||
import net.minecraft.src.EntityPlayerMP;
|
||||
import net.minecraft.src.IChunkProvider;
|
||||
import net.minecraft.src.ICommandListener;
|
||||
import net.minecraft.src.ICommandManager;
|
||||
import net.minecraft.src.IInventory;
|
||||
import net.minecraft.src.Item;
|
||||
import net.minecraft.src.ItemStack;
|
||||
@@ -508,7 +508,7 @@ public class FMLServerHandler implements IFMLSidedHandler
|
||||
* @param var2
|
||||
* @return
|
||||
*/
|
||||
public boolean handleServerCommand(String command, String player, ICommandListener listener)
|
||||
public boolean handleServerCommand(String command, String player, ICommandManager listener)
|
||||
{
|
||||
for (ModContainer mod : Loader.getModList())
|
||||
{
|
||||
|
||||
@@ -61,7 +61,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
|
||||
}
|
||||
|
||||
@Override
|
||||
public final boolean dispense(double x, double y, double z, byte xVelocity, byte zVelocity, Object... data)
|
||||
public final boolean dispense(double x, double y, double z, int xVelocity, int zVelocity, Object... data)
|
||||
{
|
||||
return dispenseEntity((World)data[0], x, y, z, xVelocity, zVelocity, (ItemStack)data[1]);
|
||||
}
|
||||
@@ -134,7 +134,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
|
||||
@Override
|
||||
public final boolean handleCommand(String command, Object... data)
|
||||
{
|
||||
return onServerCommand(command, (String)data[0], (ICommandListener)data[1]);
|
||||
return onServerCommand(command, (String)data[0], (ICommandManager)data[1]);
|
||||
}
|
||||
// BASEMOD API
|
||||
/**
|
||||
@@ -359,7 +359,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
|
||||
* @param command
|
||||
* @return true if you want to consume the message so it is not available for further processing
|
||||
*/
|
||||
public boolean onServerCommand(String command, String sender, ICommandListener listener)
|
||||
public boolean onServerCommand(String command, String sender, ICommandManager listener)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user