Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-26 10:57:47 +01:00
Code Issues Projects Releases Wiki Activity

I'm quite aware that I fail at merging.

Browse Source
This commit is contained in:
Dinnerbone 2011-02-07 01:59:06 +00:00
parent 919023fe5d
commit 172db788b3
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@ -293,6 +293,8 @@ public class MinecraftServer implements ICommandListener, Runnable {
entityplayer.a.b((Packet) (new Packet4UpdateTime(entityplayer.world.e)));
}
}
((CraftScheduler) server.getScheduler()).mainThreadHeartbeat(this.h);
for (WorldServer world : worlds) {
world.f();
@ -300,12 +302,7 @@ public class MinecraftServer implements ICommandListener, Runnable {
while (world.d()) {
;
}
;
((CraftScheduler) server.getScheduler()).mainThreadHeartbeat(this.h);
while (this.e.d()) {
;
world.c();
}
// Craftbukkit end

13
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -11,6 +11,7 @@ import net.minecraft.server.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.PropertyManager;
import net.minecraft.server.ServerConfigurationManager;
import net.minecraft.server.WorldManager;
import net.minecraft.server.WorldServer;
import org.bukkit.*;
import org.bukkit.plugin.Plugin;
@ -153,8 +154,16 @@ public final class CraftServer implements Server {
return scheduler;
}
public World[] getWorlds() {
return console.worlds.toArray(new World[0]);
public List<World> getWorlds() {
List<World> worlds = new ArrayList<World>();
synchronized (console.worlds) {
for (WorldServer world : console.worlds) {
worlds.add(world.getWorld());
}
}
return worlds;
}
public ServerConfigurationManager getHandle() {