Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-29 14:15:43 +01:00
Code Issues Projects Releases Wiki Activity

Update Upstream

Browse Source
This commit is contained in:
tr7zw 2020-05-10 16:03:44 +02:00
parent 0cad17d7e0
commit 00747a519d
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit 3591effade8ce818ec09ba2caef0fc9eca9e8728
Subproject commit 3c538c5a9b865be6d123a14e9a39718d3b4e5a0c

10
patches/server/0002-Brandings.patch
View File

@ -1,4 +1,4 @@
From 5a4b45d22b066e2d3709d3eaa53de1a812f41334 Mon Sep 17 00:00:00 2001
From 82a7a72b210e82f166cfbcc8b5f09842eba657f3 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Wed, 26 Feb 2020 18:37:34 +0100
Subject: [PATCH] Brandings
@ -53,10 +53,10 @@ index 0000000000..b7a73408ea
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f379121b2d..6dd3992674 100644
index 1bf73ca92f..b228f4ca47 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1601,7 +1601,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1613,7 +1613,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
@ -66,10 +66,10 @@ index f379121b2d..6dd3992674 100644
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 4b1332582b..df8bb734ae 100644
index e2fdd31628..186986ee61 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -204,7 +204,7 @@ import javax.annotation.Nullable; // Paper
@@ -205,7 +205,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {

6
patches/server/0008-EMC-MovedTooQuickly-event.patch
View File

@ -1,4 +1,4 @@
From ca4f212da65a60c57ece0995dc6c1e540e6caf36 Mon Sep 17 00:00:00 2001
From e9878ce4910f031a0564e34a193d3884153cbdd2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 28 Sep 2013 22:01:47 -0400
Subject: [PATCH] EMC MovedTooQuickly event
@ -9,10 +9,10 @@ also make creative immune to this event
1 file changed, 2 insertions(+)
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index e53c629d34..8ac03749f2 100644
index fa324898f8..1bab7c7641 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1028,9 +1028,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1026,9 +1026,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (d11 - d10 > Math.max(f2, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isExemptPlayer()) {
// CraftBukkit end

6
patches/server/0011-EMC-Disable-Snooper.patch
View File

@ -1,4 +1,4 @@
From 6f505028e051515133561088fd09851b1a3656a4 Mon Sep 17 00:00:00 2001
From 6708fc20e79dea2392eeea8d3cfab254cba741a9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 10 Jan 2014 22:05:59 -0500
Subject: [PATCH] EMC Disable Snooper
@ -9,10 +9,10 @@ What purpose does it provide...
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6dd3992674..a7adcb9f09 100644
index b228f4ca47..e1de3f7257 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1251,11 +1251,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1263,11 +1263,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
//} // Paper
this.methodProfiler.enter("snooper");

6
patches/server/0017-EMC-Accept-the-EULA.patch
View File

@ -1,4 +1,4 @@
From c662a6254e57fbb97c99a1f03d5772e10db9d007 Mon Sep 17 00:00:00 2001
From 6b1bab78a3758580a3fd536dcdd6ed43e5793a89 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 5 Sep 2014 23:04:54 -0400
Subject: [PATCH] EMC Accept the EULA
@ -9,10 +9,10 @@ Starlis LLC, the owner of Empire Minecraft, accepts the Minecraft EULA with this
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a7adcb9f09..6e9ff069e3 100644
index e1de3f7257..b1360c1b2c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1460,6 +1460,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1472,6 +1472,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
System.err.println( "If you do not agree to the above EULA please stop your server and remove this flag immediately." );
}
// Spigot End

6
patches/server/0022-EMC-ServerReloadEvent.patch
View File

@ -1,4 +1,4 @@
From 1babd5878364f42e03c05f75231fd3b2e839f5d6 Mon Sep 17 00:00:00 2001
From f3946fc9b795d354b1d9a308141440dc44deffab Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 25 Jun 2015 21:00:09 -0400
Subject: [PATCH] EMC ServerReloadEvent
@ -8,10 +8,10 @@ Subject: [PATCH] EMC ServerReloadEvent
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index df8bb734ae..35d0b9c4b8 100644
index 186986ee61..0d98264bda 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -779,6 +779,7 @@ public final class CraftServer implements Server {
@@ -780,6 +780,7 @@ public final class CraftServer implements Server {
@Override
public void reload() {
org.spigotmc.WatchdogThread.hasStarted = false; // Paper - Disable watchdog early timeout on reload

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

@ -1,4 +1,4 @@
From d7e946139230a8c4f15891dd08a01d486ea9e0bd Mon Sep 17 00:00:00 2001
From 1523e20cc6f7f2f0230303851e2d5a364504e118 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Thu, 5 Mar 2020 21:13:33 +0100
Subject: [PATCH] Add getLastTickMs() api
@ -10,7 +10,7 @@ Subject: [PATCH] Add getLastTickMs() api
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1be982dcd5..136602ac31 100644
index b9c9bf0387..0aca5993ec 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -893,6 +893,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -22,7 +22,7 @@ index 1be982dcd5..136602ac31 100644
public void run() {
try {
@@ -945,9 +947,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -957,9 +959,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.methodProfiler.d().d();
}
@ -36,7 +36,7 @@ index 1be982dcd5..136602ac31 100644
this.methodProfiler.exitEnter("nextTickWait");
this.ac = true;
this.ab = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
@@ -955,6 +961,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -967,6 +973,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.methodProfiler.exit();
this.methodProfiler.b();
this.hasTicked = true;
@ -45,10 +45,10 @@ index 1be982dcd5..136602ac31 100644
} else {
this.a((CrashReport) null);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 35d0b9c4b8..97fa685a02 100644
index 0d98264bda..e82f2a4800 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2251,4 +2251,13 @@ public final class CraftServer implements Server {
@@ -2256,4 +2256,13 @@ public final class CraftServer implements Server {
return mobGoals;
}
// Paper end

6
patches/server/0040-Kill-the-vanilla-GameProfiler.patch
View File

@ -1,4 +1,4 @@
From f8803752b7e4cf59bbbcf33c48043e8b81201810 Mon Sep 17 00:00:00 2001
From 88c17335e67af3543480560b01fa0a8a9ac43fa1 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Thu, 5 Mar 2020 23:08:01 +0100
Subject: [PATCH] Kill the vanilla "GameProfiler"
@ -67,7 +67,7 @@ index 0000000000..96a2270a81
+
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 136602ac31..5305799002 100644
index 0aca5993ec..5bcc38fd02 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -79,7 +79,7 @@ index 136602ac31..5305799002 100644
private ServerConnection serverConnection;
public final WorldLoadListenerFactory worldLoadListenerFactory;
private final ServerPing serverPing = new ServerPing();
@@ -944,7 +944,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -956,7 +956,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.nextTick += 50L;
if (this.T) {
this.T = false;