summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-04-21 15:43:09 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-04-21 15:43:09 +0100
commit7c455380a95407a33a8c1ec383c5b313d2645732 (patch)
tree31b98deba669a5f020a12bb88539052d8eb00ac1
parenta6c8a36dcea9c976d8b48f8b942608248db8cb4f (diff)
downloadcraftbukkit-7c455380a95407a33a8c1ec383c5b313d2645732.tar
craftbukkit-7c455380a95407a33a8c1ec383c5b313d2645732.tar.gz
craftbukkit-7c455380a95407a33a8c1ec383c5b313d2645732.tar.lz
craftbukkit-7c455380a95407a33a8c1ec383c5b313d2645732.tar.xz
craftbukkit-7c455380a95407a33a8c1ec383c5b313d2645732.zip
Java compat
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 68b9ff17..a7fed1fe 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -162,7 +162,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
// CraftBukkit start
WorldServer world = new WorldServer(this, new ServerNBTManager(new File("."), s, true), s, this.propertyManager.getBoolean("hellworld", false) ? -1 : 0, i);
- world.addIWorldAccess(new WorldManager(this, world));
+ world.addIWorldAccess((IWorldAccess)new WorldManager(this, world));
world.spawnMonsters = this.propertyManager.getBoolean("spawn-monsters", true) ? 1 : 0;
world.setSpawnFlags(this.propertyManager.getBoolean("spawn-monsters", true), this.spawnAnimals);
this.serverConfigurationManager.setPlayerFileData(world);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 987ab355..31562f7d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -4,6 +4,7 @@ import com.avaje.ebean.config.DataSourceConfig;
import com.avaje.ebean.config.ServerConfig;
import com.avaje.ebean.config.dbplatform.SQLitePlatform;
import com.avaje.ebeaninternal.server.lib.sql.TransactionIsolation;
+import net.minecraft.server.IWorldAccess;
import org.bukkit.command.*;
import org.bukkit.entity.Player;
import org.bukkit.event.world.WorldLoadEvent;
@@ -314,7 +315,7 @@ public final class CraftServer implements Server {
WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, environment == World.Environment.NETHER ? -1 : 0, seed);
- internal.addIWorldAccess(new WorldManager(console, internal));
+ internal.addIWorldAccess((IWorldAccess)new WorldManager(console, internal));
internal.spawnMonsters = 1;
internal.setSpawnFlags(true, true);
console.serverConfigurationManager.setPlayerFileData(internal);