Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed environments

Browse Source
This commit is contained in:
Tahg 2011-06-03 18:35:05 -04:00
parent ebc478388c
commit 5f684ef163
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/World.java
View File

@ -47,7 +47,7 @@ public class World implements IBlockAccess {
public int spawnMonsters; public int spawnMonsters;
public Random random = new Random(); public Random random = new Random();
public boolean s = false; public boolean s = false;
public final WorldProvider worldProvider; public WorldProvider worldProvider; // Craftbukkit - remove final
protected List u = new ArrayList(); protected List u = new ArrayList();
public IChunkProvider chunkProvider; // CraftBukkit - protected -> public public IChunkProvider chunkProvider; // CraftBukkit - protected -> public
protected final IDataManager w; protected final IDataManager w;

15
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -26,7 +26,7 @@ import org.bukkit.World;
public class CraftWorld implements World { public class CraftWorld implements World {
private final WorldServer world; private final WorldServer world;
private final Environment environment; private Environment environment;
private final CraftServer server; private final CraftServer server;
private final ChunkProviderServer provider; private final ChunkProviderServer provider;
private HashMap<Integer,CraftChunk> unloadedChunks = new HashMap<Integer, CraftChunk>(); private HashMap<Integer,CraftChunk> unloadedChunks = new HashMap<Integer, CraftChunk>();
@ -38,11 +38,7 @@ public class CraftWorld implements World {
this.server = world.getServer(); this.server = world.getServer();
this.provider = world.chunkProviderServer; this.provider = world.chunkProviderServer;
if (world.worldProvider instanceof WorldProviderHell) { environment = Environment.getEnvironment(world.worldProvider.dimension);
environment = Environment.NETHER;
} else {
environment = Environment.NORMAL;
}
server.addWorld(this); server.addWorld(this);
} }
@ -444,6 +440,13 @@ public class CraftWorld implements World {
return environment; return environment;
} }
public void setEnvironment(Environment env) {
if (environment != env) {
environment = env;
world.worldProvider = WorldProvider.a(environment.getId());
}
}
public Block getBlockAt(Location location) { public Block getBlockAt(Location location) {
return getBlockAt(location.getBlockX(), location.getBlockY(), location.getBlockZ()); return getBlockAt(location.getBlockX(), location.getBlockY(), location.getBlockZ());
} }