mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-13 19:25:49 -07:00
I'm quite aware that I fail at merging.
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user