Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Hotfix - timings close GH-74 w/ chunk sending

Browse Source
This commit is contained in:
Sotr
2019-03-22 16:32:15 +08:00
parent 193cadb6fa
commit 7d8ab5041d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -927,7 +927,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
public void t() {}
protected void a(BooleanSupplier booleansupplier) {
co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTimingUnsafe(); // Paper // Akarin
co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper // Akarin
this.slackActivityAccountant.tickStarted(); // Spigot
long i = SystemUtils.getMonotonicNanos(); long startTime = i; // Paper
@@ -998,7 +998,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
PaperLightingQueue.processQueue(startTime); // Paper
expiringMaps.removeIf(ExpiringMap::clean); // Paper
this.slackActivityAccountant.tickEnded(l); // Spigot
co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTimingUnsafe(); // Paper // Akarin
co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper // Akarin
}
public void b(BooleanSupplier booleansupplier) {

4
src/main/java/net/minecraft/server/NetworkManager.java
View File

@@ -249,7 +249,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
// Akarin start
private final void dispatchPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericFutureListener) { this.b(packet, genericFutureListener); } // Paper - OBFHELPER
private final void b(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
if (!packet.canDispatchImmediately() && packet.getType() == PacketType.PLAY_OUT_MAP_CHUNK) {
if (!packet.canDispatchImmediately()) {
this.pendingChunkQueue.add((PacketPlayOutMapChunk) packet);
return;
}
@@ -348,7 +348,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
// Paper end
public void a() {
//this.o(); // Akarin - remove packet queue
this.o();
if (this.packetListener instanceof ITickable) {
((ITickable) this.packetListener).tick();
}