Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-01-24 00:51:21 +01:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Bud Gidiere 2020-08-05 08:36:44 -05:00
parent f733a06f98
commit 8a615979b3
No known key found for this signature in database
GPG Key ID: CD18F99E348902F7
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
patches/Rainforest/api.txt
View File

@ -1 +0,0 @@
Ban-certain-plugins

2
patches/Rainforest/server.txt
View File

@ -1 +1 @@
Add-Rainforest-config&Ban-certain-plugins&Apply-advancements-async&Add-more-dupe-options&Optimize-Pathfinder-Remove-Streams-Optimized-collect&Optimize-redstone-algorithm&Async-navigation
Add-Rainforest-config&Apply-advancements-async&Add-more-dupe-options&Optimize-Pathfinder-Remove-Streams-Optimized-collect&Optimize-redstone-algorithm&Async-navigation

10
patches/server/0001-Yatopia-Server-Fixes.patch
View File

@ -827,10 +827,10 @@ index 120d0df27e76c9beef9f09e6cdc0972454fdd4ca..00000000000000000000000000000000
- }
-
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d290bc1b8bea4fac9d4e14a1ccdf954055291e66..b8fc854c49adea606812cc84eb671e5a208792f7 100644
index afaa6ab4744190b134aeb616a1355cefd1333e37..157ac689deda71cddb8baea224e88be0f5180211 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -842,6 +842,9 @@ public final class CraftServer implements Server {
@@ -836,6 +836,9 @@ public final class CraftServer implements Server {
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
app.akarin.server.Config.init((File) console.options.valueOf("akarin-settings")); // Akarin - Server Config
@ -840,7 +840,7 @@ index d290bc1b8bea4fac9d4e14a1ccdf954055291e66..b8fc854c49adea606812cc84eb671e5a
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -878,6 +881,9 @@ public final class CraftServer implements Server {
@@ -872,6 +875,9 @@ public final class CraftServer implements Server {
world.paperConfig.init(); // Paper
world.tuinityConfig.init(); // Tuinity - Server Config
world.akarinConfig.init(); // Akarin - Server Config
@ -850,7 +850,7 @@ index d290bc1b8bea4fac9d4e14a1ccdf954055291e66..b8fc854c49adea606812cc84eb671e5a
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -2255,6 +2261,27 @@ public final class CraftServer implements Server {
@@ -2249,6 +2255,27 @@ public final class CraftServer implements Server {
}
// Akarin End - Server Config
@ -878,7 +878,7 @@ index d290bc1b8bea4fac9d4e14a1ccdf954055291e66..b8fc854c49adea606812cc84eb671e5a
@Override
public void restart() {
org.spigotmc.RestartCommand.restart();
@@ -2394,4 +2421,11 @@ public final class CraftServer implements Server {
@@ -2388,4 +2415,11 @@ public final class CraftServer implements Server {
return mobGoals;
}
// Paper end

2
patches/server/0003-Brandings.patch
View File

@ -57,7 +57,7 @@ index e17119d37577de42f8d52afcfdfee64c33996941..7cc402a4dfaa2a4bb123c897b05c0919
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 b8fc854c49adea606812cc84eb671e5a208792f7..c80d67b7f5317908087ae286a53e2483c7b51df1 100644
index 157ac689deda71cddb8baea224e88be0f5180211..7bb9752edfc906ed968e839e073efd63834254fb 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

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

@ -28,10 +28,10 @@ index 7cc402a4dfaa2a4bb123c897b05c09190cbdd489..8e5284fd39be45055bec1609f6b8dd05
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 c80d67b7f5317908087ae286a53e2483c7b51df1..5d57619ae0289a48aa0c7cb57f146fe9fd96a6b1 100644
index 7bb9752edfc906ed968e839e073efd63834254fb..cdc1870b196c7fd9583dc70d856f484721ccfada 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2428,4 +2428,11 @@ public final class CraftServer implements Server {
@@ -2422,4 +2422,11 @@ public final class CraftServer implements Server {
return getServer().lagging;
}
// Purpur end