Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-22 18:46:27 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Tuinity)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Tuinity Changes:
2e7f83c Updated Upstream (Paper)
This commit is contained in:
tr7zw 2020-06-30 16:39:06 +02:00
parent 7575a4d27e
commit c322692b9c
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit bc370873043fdda84ce4b471fd1dbeed85b51196 Subproject commit 2e7f83cf6d4216113ddcd66bc4a10a227e3c1877

12
patches/server/0005-Add-getLastTickMs-api.patch
View File

@ -1,4 +1,4 @@
From 3722cb3a76dc7a7ddd12a303935b73d284962179 Mon Sep 17 00:00:00 2001 From dd873e44d15d7ed73b6c6767299784c0e42e46e0 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de> From: tr7zw <tr7zw@live.de>
Date: Thu, 5 Mar 2020 21:13:33 +0100 Date: Thu, 5 Mar 2020 21:13:33 +0100
Subject: [PATCH] Add getLastTickMs() api Subject: [PATCH] Add getLastTickMs() api
@ -10,7 +10,7 @@ Subject: [PATCH] Add getLastTickMs() api
3 files changed, 15 insertions(+), 1 deletion(-) 3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e1373f2c0a..9bb5e0c980 100644 index 56e41760fd..90a793e8dc 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -933,6 +933,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -933,6 +933,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -59,7 +59,7 @@ index 0ed2d27a1b..70afb87c46 100644
+ // YAPFA end + // YAPFA end
} }
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
index f70173827f..b1aeac39bc 100644 index 7218f23df4..a4f6df8606 100644
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
@@ -33,7 +33,7 @@ public class TicksPerSecondCommand extends Command @@ -33,7 +33,7 @@ public class TicksPerSecondCommand extends Command
@ -68,9 +68,9 @@ index f70173827f..b1aeac39bc 100644
} }
- sender.sendMessage(ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " + org.apache.commons.lang.StringUtils.join(tpsAvg, ", ")); - sender.sendMessage(ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " + org.apache.commons.lang.StringUtils.join(tpsAvg, ", "));
+ sender.sendMessage( ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " + org.apache.commons.lang.StringUtils.join(tpsAvg, ", ") + " Last tick time: " + org.bukkit.Bukkit.getLastTickMs() + "ms"); // YAPFA + sender.sendMessage( ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " + org.apache.commons.lang.StringUtils.join(tpsAvg, ", ") + " Last tick time: " + org.bukkit.Bukkit.getLastTickMs() + "ms"); // YAPFA
sender.sendMessage(ChatColor.GOLD + "Current Memory Usage: " + ChatColor.GREEN + ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024 * 1024)) + "/" + (Runtime.getRuntime().totalMemory() / (1024 * 1024)) + " mb (Max: " + (Runtime.getRuntime().maxMemory() / (1024 * 1024)) + " mb)"); if (args.length > 0 && args[0].equals("mem") && sender.hasPermission("bukkit.command.tpsmemory")) {
// Paper end sender.sendMessage(ChatColor.GOLD + "Current Memory Usage: " + ChatColor.GREEN + ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024 * 1024)) + "/" + (Runtime.getRuntime().totalMemory() / (1024 * 1024)) + " mb (Max: " + (Runtime.getRuntime().maxMemory() / (1024 * 1024)) + " mb)");
if (!hasShownMemoryWarning) {
-- --
2.25.1.windows.1 2.25.1.windows.1

25
patches/server/0010-Player-saving-async-FileIO.patch
View File

@ -1,4 +1,4 @@
From c8bbeeb2508aff00d20faa04226225750d4ba734 Mon Sep 17 00:00:00 2001 From c39e0c9acec0be7acf15457b9da65000710dd0a1 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de> From: tr7zw <tr7zw@live.de>
Date: Sat, 4 Apr 2020 23:23:04 +0200 Date: Sat, 4 Apr 2020 23:23:04 +0200
Subject: [PATCH] Player saving async FileIO Subject: [PATCH] Player saving async FileIO
@ -6,13 +6,13 @@ Subject: [PATCH] Player saving async FileIO
--- ---
.../server/AdvancementDataPlayer.java | 106 ++++++++++-------- .../server/AdvancementDataPlayer.java | 106 ++++++++++--------
.../net/minecraft/server/EntityHuman.java | 16 ++- .../net/minecraft/server/EntityHuman.java | 16 ++-
.../java/net/minecraft/server/PlayerList.java | 28 ++++- .../java/net/minecraft/server/PlayerList.java | 29 ++++-
.../server/ServerStatisticManager.java | 21 +++- .../server/ServerStatisticManager.java | 21 +++-
.../net/minecraft/server/WorldNBTStorage.java | 29 +++-- .../net/minecraft/server/WorldNBTStorage.java | 29 +++--
5 files changed, 138 insertions(+), 62 deletions(-) 5 files changed, 139 insertions(+), 62 deletions(-)
diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
index 57b9d1344..540bd10f7 100644 index 57b9d13447..540bd10f7e 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -27,6 +27,8 @@ import java.util.List; @@ -27,6 +27,8 @@ import java.util.List;
@ -145,7 +145,7 @@ index 57b9d1344..540bd10f7 100644
} }
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 2cada09ce..321726139 100644 index 2cada09ced..321726139d 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -700,11 +700,23 @@ public abstract class EntityHuman extends EntityLiving { @@ -700,11 +700,23 @@ public abstract class EntityHuman extends EntityLiving {
@ -183,19 +183,20 @@ index 2cada09ce..321726139 100644
nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft()); nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft());
} }
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 35d7ac60f..c217bae5b 100644 index 3c5ba8f2fd..919c584627 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -19,6 +19,8 @@ import java.util.Optional; @@ -18,6 +18,9 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeUnit;
+ +
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@@ -1241,6 +1243,28 @@ public abstract class PlayerList { @@ -1237,6 +1240,28 @@ public abstract class PlayerList {
if (team != null) scoreboard.removeTeam(team); if (team != null) scoreboard.removeTeam(team);
} }
// Paper end // Paper end
@ -224,7 +225,7 @@ index 35d7ac60f..c217bae5b 100644
} }
// Paper end // Paper end
@@ -1278,13 +1302,13 @@ public abstract class PlayerList { @@ -1274,13 +1299,13 @@ public abstract class PlayerList {
File file = this.server.a(SavedFile.STATS).toFile(); File file = this.server.a(SavedFile.STATS).toFile();
File file1 = new File(file, uuid + ".json"); File file1 = new File(file, uuid + ".json");
@ -241,7 +242,7 @@ index 35d7ac60f..c217bae5b 100644
serverstatisticmanager = new ServerStatisticManager(this.server, file1); serverstatisticmanager = new ServerStatisticManager(this.server, file1);
// this.o.put(uuid, serverstatisticmanager); // CraftBukkit // this.o.put(uuid, serverstatisticmanager); // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
index 18725272f..5033db43e 100644 index 18725272f9..5033db43e3 100644
--- a/src/main/java/net/minecraft/server/ServerStatisticManager.java --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
@@ -20,6 +20,10 @@ import java.util.Map; @@ -20,6 +20,10 @@ import java.util.Map;
@ -309,7 +310,7 @@ index 18725272f..5033db43e 100644
ServerStatisticManager.LOGGER.warn("Invalid statistic in {}: Don't know what {} is", this.d, s2); ServerStatisticManager.LOGGER.warn("Invalid statistic in {}: Don't know what {} is", this.d, s2);
}); });
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
index 41a1b93a9..9517fb046 100644 index 41a1b93a9e..9517fb0465 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -11,6 +11,10 @@ import org.apache.logging.log4j.LogManager; @@ -11,6 +11,10 @@ import org.apache.logging.log4j.LogManager;

8
patches/server/0015-Modify-default-configs.patch
View File

@ -1,4 +1,4 @@
From a3915a2ad6aed21a8cf260cd1c8dd89d885a38f9 Mon Sep 17 00:00:00 2001 From e7a154d1f6ae0a6b1ca84d545cc8167dbb68c49b Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de> From: tr7zw <tr7zw@live.de>
Date: Tue, 21 Apr 2020 16:14:10 +0200 Date: Tue, 21 Apr 2020 16:14:10 +0200
Subject: [PATCH] Modify default configs Subject: [PATCH] Modify default configs
@ -9,7 +9,7 @@ Subject: [PATCH] Modify default configs
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 3b0f3127b..afb1d30ca 100644 index 3b0f3127bc..afb1d30cac 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -201,7 +201,7 @@ public class PaperConfig { @@ -201,7 +201,7 @@ public class PaperConfig {
@ -22,10 +22,10 @@ index 3b0f3127b..afb1d30ca 100644
TimingsManager.privacy = getBoolean("timings.server-name-privacy", false); TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses")); TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses"));
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 0f4fca90f..9d02268c8 100644 index e471e76493..b0b497c8cd 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -605,7 +605,7 @@ public class PaperWorldConfig { @@ -600,7 +600,7 @@ public class PaperWorldConfig {
} }
public boolean cooldownHopperWhenFull = true; public boolean cooldownHopperWhenFull = true;