diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch index 402f7321..c6810216 100644 --- a/patches/server/0001-Yatopia-Server-Fixes.patch +++ b/patches/server/0001-Yatopia-Server-Fixes.patch @@ -33,7 +33,7 @@ index 572780ca665c0fb254cc7431af3dd7759a94f26c..00000000000000000000000000000000 - - new TimingsExport(listeners, parent, history).start(); diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index f81bd67a323f2e72bdad76c52016993a0bf88307..415be72e83e0638bee1dd7e03807194554e6e08c 100644 +index f81bd67a323f2e72bdad76c52016993a0bf88307..200ef278c7822cda12f8382bd4453c32d8f47536 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -439,18 +439,18 @@ public class PaperCommand extends Command { @@ -49,7 +49,7 @@ index f81bd67a323f2e72bdad76c52016993a0bf88307..415be72e83e0638bee1dd7e038071945 MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); - ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ); -+ ChunkCoordIntPair chunk = new ChunkCoordIntPair(entity.getChunkX(), entity.getChunkZ()); ++ ChunkCoordIntPair chunk = new ChunkCoordIntPair(entity.chunkX(), entity.chunkZ()); info.left++; info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1); - if (!chunkProviderServer.isInEntityTickingChunk(e)) { @@ -992,7 +992,7 @@ index 120d0df27e76c9beef9f09e6cdc0972454fdd4ca..00000000000000000000000000000000 - } - diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index afaa6ab4744190b134aeb616a1355cefd1333e37..157ac689deda71cddb8baea224e88be0f5180211 100644 +index afaa6ab4744190b134aeb616a1355cefd1333e37..51c59159e04c6f48cb99f691cb64245973d8e628 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -836,6 +836,9 @@ public final class CraftServer implements Server { @@ -1015,7 +1015,7 @@ index afaa6ab4744190b134aeb616a1355cefd1333e37..157ac689deda71cddb8baea224e88be0 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -2249,6 +2255,27 @@ public final class CraftServer implements Server { +@@ -2249,6 +2255,25 @@ public final class CraftServer implements Server { } // Akarin End - Server Config @@ -1037,13 +1037,11 @@ index afaa6ab4744190b134aeb616a1355cefd1333e37..157ac689deda71cddb8baea224e88be0 + }*/ + // Purpur end + -+ @Override -+ public YamlConfiguration getOrigamiConfig() { return com.mrivanplays.origami.OrigamiConfig.config; } // Origami - add config to timings report -+ ++ @Override public void restart() { org.spigotmc.RestartCommand.restart(); -@@ -2388,4 +2415,11 @@ public final class CraftServer implements Server { +@@ -2388,4 +2413,11 @@ public final class CraftServer implements Server { return mobGoals; } // Paper end diff --git a/patches/server/0003-Brandings.patch b/patches/server/0003-Brandings.patch index 8d509a1a..d658d489 100644 --- a/patches/server/0003-Brandings.patch +++ b/patches/server/0003-Brandings.patch @@ -57,7 +57,7 @@ index 5960ed2e91008b363dad900c72064055413eafd9..ee6a2dbc1306871d9ba621f199054bef public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 157ac689deda71cddb8baea224e88be0f5180211..7bb9752edfc906ed968e839e073efd63834254fb 100644 +index 51c59159e04c6f48cb99f691cb64245973d8e628..e5aa68bd8c678398c81af96303669f1ec1b1d375 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -217,7 +217,7 @@ import javax.annotation.Nullable; // Paper diff --git a/patches/server/0004-Add-GameProfileLookupEvent.patch b/patches/server/0004-Add-GameProfileLookupEvent.patch index 984679d9..6cc68ba5 100644 --- a/patches/server/0004-Add-GameProfileLookupEvent.patch +++ b/patches/server/0004-Add-GameProfileLookupEvent.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: tr7zw +From: Bud Gidiere Date: Wed, 5 Aug 2020 14:25:50 -0500 Subject: [PATCH] Add GameProfileLookupEvent diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java -index dd96dd296d042c0625e527b50b3acfc19a2bf43e..b4a032cada15cdfbcae4f37cd0e36f1aee3cefbb 100644 +index dd96dd296d042c0625e527b50b3acfc19a2bf43e..0c5f2a010f30eb32bea273d7e65b0741016480e5 100644 --- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java @@ -5,9 +5,13 @@ import com.google.common.base.Charsets; @@ -22,34 +22,39 @@ index dd96dd296d042c0625e527b50b3acfc19a2bf43e..b4a032cada15cdfbcae4f37cd0e36f1a import org.bukkit.craftbukkit.entity.CraftPlayer; import org.spigotmc.SpigotConfig; -@@ -186,12 +190,21 @@ public class CraftPlayerProfile implements PlayerProfile { +@@ -182,17 +186,24 @@ public class CraftPlayerProfile implements PlayerProfile { + } + public boolean complete(boolean textures, boolean onlineMode) { + MinecraftServer server = MinecraftServer.getServer(); +- boolean isCompleteFromCache = this.completeFromCache(true, onlineMode); if (onlineMode && (!isCompleteFromCache || textures && !hasTextures())) { - GameProfile result = server.getMinecraftSessionService().fillProfileProperties(profile, true); +- GameProfile result = server.getMinecraftSessionService().fillProfileProperties(profile, true); - if (result != null) { - copyProfileProperties(result, this.profile, true); -- } ++ // Yatopia start ++ GameProfileLookupEvent event = new GameProfileLookupEvent(!Bukkit.isPrimaryThread(), profile.getId(), profile.getName()); ++ Bukkit.getServer().getPluginManager().callEvent(event); ++ if (event.getGameProfile() != null) { ++ this.profile = event.getGameProfile(); ++ } else { ++ GameProfile result = server.getMinecraftSessionService().fillProfileProperties(profile, true); ++ if (result != null) { ++ copyProfileProperties(result, this.profile, true); ++ } ++ if (this.profile.isComplete()) { ++ server.getUserCache().saveProfile(this.profile); ++ } ++ } ++ // Yatopia end + } - if (this.profile.isComplete()) { - server.getUserCache().saveProfile(this.profile); - } -+ // Yatopia start -+ GameProfileLookupEvent event = new GameProfileLookupEvent(!Bukkit.isPrimaryThread(), profile.getId(), profile.getName()); -+ Bukkit.getServer().getPluginManager().callEvent(event); -+ if (event.getGameProfile() != null) { -+ this.profile = event.getGameProfile(); -+ } else { -+ GameProfile result = server.getSessionService().fillProfileProperties(profile, true); -+ if (result != null) { -+ copyProfileProperties(result, this.profile, true); -+ } -+ if (this.profile.isComplete()) { -+ server.getUserCache().saveProfile(this.profile); -+ } -+ } -+ // Yatopia end - } +- } return profile.isComplete() && (!onlineMode || !textures || hasTextures()); } + diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java index 579a81e521fdfabfa0318d06c6760a8ab7a88c1e..ceb1f18a49ebc8fbac270d9f221fa44f9baea216 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java diff --git a/patches/server/0005-Add-getLastTickMs-api.patch b/patches/server/0005-Add-getLastTickMs-api.patch index 6ffd3343..3470bc41 100644 --- a/patches/server/0005-Add-getLastTickMs-api.patch +++ b/patches/server/0005-Add-getLastTickMs-api.patch @@ -28,10 +28,10 @@ index ee6a2dbc1306871d9ba621f199054befb09744c2..26ee6e9219059c9f7175148e934d2ade this.X = true; // Purpur start - tps catchup diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7bb9752edfc906ed968e839e073efd63834254fb..cdc1870b196c7fd9583dc70d856f484721ccfada 100644 +index e5aa68bd8c678398c81af96303669f1ec1b1d375..e1c62bcb9186518d2ad7f95b2d02847f210acd86 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2422,4 +2422,11 @@ public final class CraftServer implements Server { +@@ -2420,4 +2420,11 @@ public final class CraftServer implements Server { return getServer().lagging; } // Purpur end diff --git a/patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch b/patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch index 4b43ff52..f12fd647 100644 --- a/patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch +++ b/patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: tr7zw +From: Bud Gidiere Date: Wed, 5 Aug 2020 08:05:10 -0500 Subject: [PATCH] Add config Yatopia command and basic settings diff --git a/patches/server/0022-Optimize-TileEntity-loading.patch b/patches/server/0022-Optimize-TileEntity-loading.patch index cdb03cff..130b1af2 100644 --- a/patches/server/0022-Optimize-TileEntity-loading.patch +++ b/patches/server/0022-Optimize-TileEntity-loading.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: tr7zw +From: Bud Gidiere Date: Wed, 5 Aug 2020 08:08:44 -0500 Subject: [PATCH] Optimize TileEntity loading diff --git a/patches/server/0026-Redirect-Configs.patch b/patches/server/0026-Redirect-Configs.patch index b948147e..33de6260 100644 --- a/patches/server/0026-Redirect-Configs.patch +++ b/patches/server/0026-Redirect-Configs.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Sotr +From: Bud Gidiere Date: Wed, 5 Aug 2020 08:17:46 -0500 Subject: [PATCH] Redirect Configs