Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-02-16 20:32:32 +01:00
Code Issues Projects Releases Wiki Activity

Port a few more fixes

Browse Source
This commit is contained in:
tr7zw 2020-03-09 22:47:29 +01:00
parent b9a6601816
commit 9473d164df
2 changed files with 117 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
patches/server/0046-Option-for-async-world-ticking.patch
View File

@ -1,4 +1,4 @@
From db2ae5023bc314a789e86f5b5f7e0ad76654699b Mon Sep 17 00:00:00 2001
From db49e34c410bc6380c4427e7417eddadcefc2f6d Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Mon, 9 Mar 2020 18:49:50 +0100
Subject: [PATCH] Option for async world ticking
@ -7,9 +7,12 @@ Subject: [PATCH] Option for async world ticking
.../java/de/tr7zw/yapfa/YapfaCommand.java | 2 +
src/main/java/de/tr7zw/yapfa/YapfaConfig.java | 5 +
.../minecraft/server/ChunkProviderServer.java | 2 +-
.../minecraft/server/EntityTrackerEntry.java | 2 +-
.../net/minecraft/server/MinecraftServer.java | 141 ++++++++++++------
.../net/minecraft/server/WorldServer.java | 34 ++++-
5 files changed, 139 insertions(+), 45 deletions(-)
.../net/minecraft/server/PlayerChunkMap.java | 7 +-
.../server/PlayerConnectionUtils.java | 12 +-
.../net/minecraft/server/WorldServer.java | 42 +++++-
8 files changed, 163 insertions(+), 50 deletions(-)
diff --git a/src/main/java/de/tr7zw/yapfa/YapfaCommand.java b/src/main/java/de/tr7zw/yapfa/YapfaCommand.java
index 58ce1f826..ed987cd15 100644
@ -51,6 +54,19 @@ index 76c7f4a50..e5831d778 100644
return (IChunkAccess) CompletableFuture.supplyAsync(() -> {
return this.getChunkAt(i, j, chunkstatus, flag);
}, this.serverThreadQueue).join();
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 3a88c9a67..e7ed993ef 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -85,7 +85,7 @@ public class EntityTrackerEntry {
if (this.tickCounter % 10 == 0 && itemstack.getItem() instanceof ItemWorldMap) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks
WorldMap worldmap = ItemWorldMap.getSavedMap(itemstack, this.b);
- Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
+ Iterator iterator = new HashSet<>(this.trackedPlayers).iterator(); // CraftBukkit
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 692c0cac9..495eb7833 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
@ -232,11 +248,87 @@ index 692c0cac9..495eb7833 100644
this.methodProfiler.exitEnter("connection");
MinecraftTimings.connectionTimer.startTiming(); // Spigot
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 57bea926a..981f31ad0 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap; // Paper
+import java.util.HashSet;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -1644,7 +1645,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
public void broadcast(Packet<?> packet) {
- Iterator iterator = this.trackedPlayers.iterator();
+ Iterator iterator = new HashSet<>(this.trackedPlayers).iterator();
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -1663,7 +1664,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
public void a() {
- Iterator iterator = this.trackedPlayers.iterator();
+ Iterator iterator = new HashSet<>(this.trackedPlayers).iterator();
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -1739,7 +1740,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
public void track(List<EntityPlayer> list) {
- Iterator iterator = list.iterator();
+ Iterator iterator = new ArrayList<>(list).iterator();
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
index eb3269e0e..e3cb16e39 100644
--- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
+++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
@@ -4,13 +4,23 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import co.aikar.timings.MinecraftTimings; // Paper
import co.aikar.timings.Timing; // Paper
+import co.aikar.timings.Timings;
public class PlayerConnectionUtils {
private static final Logger LOGGER = LogManager.getLogger();
public static <T extends PacketListener> void ensureMainThread(Packet<T> packet, T t0, WorldServer worldserver) throws CancelledPacketHandleException {
- ensureMainThread(packet, t0, (IAsyncTaskHandler) worldserver.getMinecraftServer());
+ // YAPFA start
+ if (Timings.isTimingsEnabled()) {
+ ensureMainThread(packet, t0, (IAsyncTaskHandler) worldserver.getMinecraftServer());
+ } else {
+ if (!de.tr7zw.yapfa.MainThreadHandler.isMainThread(Thread.currentThread())) {
+ worldserver.packets.add(() -> packet.a(t0));
+ throw CancelledPacketHandleException.INSTANCE;
+ }
+ }
+ // YAPFA end
}
public static <T extends PacketListener> void ensureMainThread(Packet<T> packet, T t0, IAsyncTaskHandler<?> iasynctaskhandler) throws CancelledPacketHandleException {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c74b85917..1f908c647 100644
index c74b85917..09767fb85 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -31,6 +31,7 @@ import java.util.Queue;
@@ -22,6 +22,7 @@ import java.io.BufferedWriter;
import java.io.IOException;
import java.io.Writer;
import java.nio.file.Files;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -31,6 +32,7 @@ import java.util.Queue;
import java.util.Random;
import java.util.Set;
import java.util.UUID;
@ -244,7 +336,7 @@ index c74b85917..1f908c647 100644
import java.util.concurrent.Executor;
import java.util.function.BooleanSupplier;
import java.util.function.Predicate;
@@ -51,7 +52,8 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -51,7 +53,8 @@ import org.bukkit.event.weather.LightningStrikeEvent;
import org.bukkit.event.world.TimeSkipEvent;
// CraftBukkit end
@ -254,15 +346,22 @@ index c74b85917..1f908c647 100644
private static final Logger LOGGER = LogManager.getLogger();
private final List<Entity> globalEntityList = Lists.newArrayList();
@@ -2135,4 +2137,34 @@ public class WorldServer extends World {
@@ -2135,4 +2138,41 @@ public class WorldServer extends World {
return structureboundingbox.b((BaseBlockPosition) blockactiondata.a());
});
}
+
+ // YAPFA start
+ public List<Runnable> packets = new ArrayList<Runnable>();
+
+ @Override
+ public Long call() throws Exception {
+ long start = System.currentTimeMillis();
+ List<Runnable> copy = new ArrayList<>(packets);
+ copy.forEach(r -> {
+ packets.remove(r);
+ r.run();
+ });
+ hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
+ TileEntityHopper.skipHopperEvents = paperConfig.disableHopperMoveEvents || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
+

22
patches/server/0046-PAPER-Reduce-entity-tracker-updates-on-move.patch → patches/server/0047-PAPER-Reduce-entity-tracker-updates-on-move.patch
View File

@ -1,4 +1,4 @@
From b8b3b931ccfa1f390db02deb97a830c537284652 Mon Sep 17 00:00:00 2001
From 51251165c6affd6ae483bab6058c1e2bcf2729c9 Mon Sep 17 00:00:00 2001
From: froobynooby <froobynooby@froobworld.com>
Date: Thu, 20 Feb 2020 15:50:49 +0930
Subject: [PATCH] PAPER Reduce entity tracker updates on move
@ -74,10 +74,10 @@ index e7bfbc330..43774bc9a 100644
// CraftBukkit start
public String displayName;
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 57bea926a..d971a4426 100644
index 981f31ad0..d54237414 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -133,6 +133,39 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -134,6 +134,39 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
@ -117,7 +117,7 @@ index 57bea926a..d971a4426 100644
// Paper end
public PlayerChunkMap(WorldServer worldserver, File file, DataFixer datafixer, DefinedStructureManager definedstructuremanager, Executor executor, IAsyncTaskHandler<Runnable> iasynctaskhandler, ILightAccess ilightaccess, ChunkGenerator<?> chunkgenerator, WorldLoadListener worldloadlistener, Supplier<WorldPersistentData> supplier, int i) {
@@ -167,6 +200,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -168,6 +201,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
this.m = new VillagePlace(new File(this.w, "poi"), datafixer, this.world); // Paper
this.setViewDistance(i);
this.playerMobDistanceMap = this.world.paperConfig.perPlayerMobSpawns ? new com.destroystokyo.paper.util.PlayerMobDistanceMap() : null; // Paper
@ -125,7 +125,7 @@ index 57bea926a..d971a4426 100644
}
public void updatePlayerMobTypeMap(Entity entity) {
@@ -1334,8 +1368,19 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1335,8 +1369,19 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
public void movePlayer(EntityPlayer entityplayer) {
@ -146,7 +146,7 @@ index 57bea926a..d971a4426 100644
while (objectiterator.hasNext()) {
PlayerChunkMap.EntityTracker playerchunkmap_entitytracker = (PlayerChunkMap.EntityTracker) objectiterator.next();
@@ -1345,6 +1390,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1346,6 +1391,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
playerchunkmap_entitytracker.updatePlayer(entityplayer);
}
}
@ -154,7 +154,7 @@ index 57bea926a..d971a4426 100644
int i = MathHelper.floor(entityplayer.locX()) >> 4;
int j = MathHelper.floor(entityplayer.locZ()) >> 4;
@@ -1486,12 +1532,21 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1487,12 +1533,21 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
playerchunkmap_entitytracker.clear(entityplayer);
}
@ -176,7 +176,7 @@ index 57bea926a..d971a4426 100644
}
entity.tracker = null; // Paper - We're no longer tracked
}
@@ -1532,7 +1587,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1533,7 +1588,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
world.timings.tracker2.stopTiming(); // Paper
}
@ -185,7 +185,7 @@ index 57bea926a..d971a4426 100644
}
@@ -1581,6 +1636,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1582,6 +1637,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
}
}
@ -193,7 +193,7 @@ index 57bea926a..d971a4426 100644
Iterator iterator;
Entity entity1;
@@ -1677,6 +1733,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1678,6 +1734,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
org.spigotmc.AsyncCatcher.catchOp("player tracker clear"); // Spigot
if (this.trackedPlayers.remove(entityplayer)) {
this.trackerEntry.a(entityplayer);
@ -201,7 +201,7 @@ index 57bea926a..d971a4426 100644
}
}
@@ -1713,9 +1770,11 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1714,9 +1771,11 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
if (flag1 && this.trackedPlayerMap.putIfAbsent(entityplayer, true) == null) { // Paper
this.trackerEntry.b(entityplayer);