Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-26 04:25:39 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
tr7zw 2020-05-24 13:44:25 +02:00
parent e6d6b768e3
commit 1e07d21232
12 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit 6eb873cadacf046e8d542b24426e5297f08fa878
Subproject commit 121cca1e2fc2e47a6475f1c0a7a1397236701f16

8
patches/server/0001-Modify-POM.patch
View File

@ -1,4 +1,4 @@
From a3282d8ebfd6a10c6ccb8ed3f5c42a8e09b78fa6 Mon Sep 17 00:00:00 2001
From 12c6f0850f54b35a108041a4be02a26df06d5a82 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Wed, 26 Feb 2020 17:08:07 +0100
Subject: [PATCH] Modify POM
@ -8,7 +8,7 @@ Subject: [PATCH] Modify POM
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index d8c0790f30..b9ca31f0fb 100644
index ba3d10a1b7..f2cc703fe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,12 @@
@ -48,7 +48,7 @@ index d8c0790f30..b9ca31f0fb 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -143,6 +144,10 @@
@@ -148,6 +149,10 @@
Please see https://www.spigotmc.org/go/maven for more information.
-->
@ -59,7 +59,7 @@ index d8c0790f30..b9ca31f0fb 100644
<repository>
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
@@ -158,15 +163,15 @@
@@ -163,15 +168,15 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>

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

@ -1,4 +1,4 @@
From 66972e785671f061e8d110f39a9bf9d0abf3fdf1 Mon Sep 17 00:00:00 2001
From 07849069eed17d58d7c61ecfa2e3bba7d0555111 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 ecca604030..569ba87cee 100644
index 85cc5914e1..32468041ea 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1617,7 +1617,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1622,7 +1622,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
@ -79,7 +79,7 @@ index 0f97cf2b41..b281f05c4b 100644
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index aa8f135250..42a24f6d1e 100644
index b58f2ef5ce..c66a63a8fb 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

12
patches/server/0004-EMC-PlayerUseItem-Event.patch
View File

@ -1,4 +1,4 @@
From f7fb8d4fe0c2d15e8a6ed186906c49313419ae43 Mon Sep 17 00:00:00 2001
From 8455f7508c6c62acf1a2d42494a9a8eccfb1cf9e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 22 Dec 2012 00:35:15 -0500
Subject: [PATCH] EMC PlayerUseItem Event
@ -23,10 +23,10 @@ index 3fc2360a10..5ad0aacf01 100644
this.setSlot(EnumItemSlot.MAINHAND, itemstack);
} else {
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index 9fb008f64d..54ce069e50 100644
index 272c1f0eaf..76a8d94229 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -426,6 +426,15 @@ public class PlayerInteractManager {
@@ -432,6 +432,15 @@ public class PlayerInteractManager {
}
public EnumInteractionResult a(EntityHuman entityhuman, World world, ItemStack itemstack, EnumHand enumhand) {
@ -42,7 +42,7 @@ index 9fb008f64d..54ce069e50 100644
if (this.gamemode == EnumGamemode.SPECTATOR) {
return EnumInteractionResult.PASS;
} else if (entityhuman.getCooldownTracker().hasCooldown(itemstack.getItem())) {
@@ -433,27 +442,53 @@ public class PlayerInteractManager {
@@ -439,27 +448,53 @@ public class PlayerInteractManager {
} else {
int i = itemstack.getCount();
int j = itemstack.getDamage();
@ -102,7 +102,7 @@ index 9fb008f64d..54ce069e50 100644
((EntityPlayer) entityhuman).updateInventory(entityhuman.defaultContainer);
}
@@ -467,6 +502,7 @@ public class PlayerInteractManager {
@@ -473,6 +508,7 @@ public class PlayerInteractManager {
public boolean firedInteract = false;
public EnumInteractionResult a(EntityHuman entityhuman, World world, ItemStack itemstack, EnumHand enumhand, MovingObjectPositionBlock movingobjectpositionblock) {
BlockPosition blockposition = movingobjectpositionblock.getBlockPosition();
@ -110,7 +110,7 @@ index 9fb008f64d..54ce069e50 100644
IBlockData iblockdata = world.getType(blockposition);
EnumInteractionResult enuminteractionresult = EnumInteractionResult.PASS;
boolean cancelledBlock = false;
@@ -534,17 +570,45 @@ public class PlayerInteractManager {
@@ -540,17 +576,45 @@ public class PlayerInteractManager {
}
if (!itemstack.isEmpty() && enuminteractionresult != EnumInteractionResult.SUCCESS && !interactResult) { // add !interactResult SPIGOT-764

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

@ -1,4 +1,4 @@
From c6cf67c185e236bd9e3fe3d6204c42a1b40be23e Mon Sep 17 00:00:00 2001
From dd8d9f054298ee190dbf501086ed38219a9a1701 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 569ba87cee..2335f13c55 100644
index 32468041ea..04aa83f0c6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1267,11 +1267,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1272,11 +1272,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 cd712e17a82a148245864d37ba8cf2721cb4167e Mon Sep 17 00:00:00 2001
From 313aa7dbfcfbc0833119366596bf490329225319 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 2335f13c55..049860a211 100644
index 04aa83f0c6..e361f4a7f1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1476,6 +1476,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1481,6 +1481,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

10
patches/server/0035-Add-getLastTickMs-api.patch
View File

@ -1,4 +1,4 @@
From db475ecf5d7f8a1a5dc39cf52047ac46dc644dda Mon Sep 17 00:00:00 2001
From 7ae9a2ae315cba0691a6515658a95c3e51e58b7f 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,10 +10,10 @@ 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 049860a211..3daa46271b 100644
index e361f4a7f1..01fb435f26 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
@@ -898,6 +898,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
private static final java.math.BigDecimal TPS_BASE = new java.math.BigDecimal(1E9).multiply(new java.math.BigDecimal(SAMPLE_INTERVAL));
// Paper End
// Spigot End
@ -22,7 +22,7 @@ index 049860a211..3daa46271b 100644
public void run() {
try {
@@ -957,9 +959,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -962,9 +964,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.methodProfiler.d().d();
}
@ -36,7 +36,7 @@ index 049860a211..3daa46271b 100644
this.methodProfiler.exitEnter("nextTickWait");
this.ac = true;
this.ab = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
@@ -967,6 +973,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -972,6 +978,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.methodProfiler.exit();
this.methodProfiler.b();
this.hasTicked = true;

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

@ -1,4 +1,4 @@
From 2443668f9b71af2bcdd322b5c629d12dfd7fd019 Mon Sep 17 00:00:00 2001
From 6d17034282bc77902a9afa910b1467e7f57b99d6 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 3daa46271b..fb21fba051 100644
index 01fb435f26..43bec703f0 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 3daa46271b..fb21fba051 100644
private ServerConnection serverConnection;
public final WorldLoadListenerFactory worldLoadListenerFactory;
private final ServerPing serverPing = new ServerPing();
@@ -956,7 +956,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -961,7 +961,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.nextTick += 50L;
if (this.T) {
this.T = false;

6
patches/server/0041-Add-option-for-pushable-TileEntities.patch
View File

@ -1,4 +1,4 @@
From e8f6ba8d82555ad2b33a6871d649b4cad32caf93 Mon Sep 17 00:00:00 2001
From 908e9bd4e1b6ffce5999666e559d47ae4c01bb97 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Sun, 29 Mar 2020 01:59:27 +0100
Subject: [PATCH] Add option for pushable TileEntities
@ -669,10 +669,10 @@ index 0000000000..b32f231981
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 82a623d63d..0e1ab3fdff 100644
index d620f8e920..ae823c2c9a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -384,6 +384,13 @@ public class WorldServer extends World {
@@ -390,6 +390,13 @@ public class WorldServer extends World {
if (type instanceof ITileEntity) {
TileEntity replacement = ((ITileEntity) type).createTile(this);

6
patches/server/0042-Add-NBT-API-as-first-class-lib.patch
View File

@ -1,4 +1,4 @@
From 6ad7b7497e3c376674145ed58f375ba082a18708 Mon Sep 17 00:00:00 2001
From ef033a81b8d3d245c710b948b1f2243eb8db8c82 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Thu, 2 Apr 2020 18:49:38 +0200
Subject: [PATCH] Add NBT-API as first-class lib
@ -8,10 +8,10 @@ Subject: [PATCH] Add NBT-API as first-class lib
1 file changed, 4 insertions(+)
diff --git a/pom.xml b/pom.xml
index b9ca31f0fb..c76bae0ca0 100644
index f2cc703fe6..8893d9626e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,6 +293,10 @@
@@ -305,6 +305,10 @@
<pattern>net.minecraft.server</pattern>
<shadedPattern>net.minecraft.server.v${minecraft_version}</shadedPattern>
</relocation>

8
patches/server/0043-Player-saving-async-FileIO.patch
View File

@ -1,4 +1,4 @@
From bb740c4b93bccde23565a0097224cba6f65bc052 Mon Sep 17 00:00:00 2001
From c153e75244501d62f7a6e871dc4c2db8e39d9ee0 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Sat, 4 Apr 2020 23:23:04 +0200
Subject: [PATCH] Player saving async FileIO
@ -183,7 +183,7 @@ index c1e8ff6ab3..db4f628830 100644
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
index 9b726de6da..a06340d0b3 100644
index 269580ae2a..b2af3be151 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -16,6 +16,8 @@ import java.util.Map;
@ -195,7 +195,7 @@ index 9b726de6da..a06340d0b3 100644
import javax.annotation.Nullable;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -1187,6 +1189,28 @@ public abstract class PlayerList {
@@ -1203,6 +1205,28 @@ public abstract class PlayerList {
if (team != null) scoreboard.removeTeam(team);
}
// Paper end
@ -224,7 +224,7 @@ index 9b726de6da..a06340d0b3 100644
}
// Paper end
@@ -1226,13 +1250,13 @@ public abstract class PlayerList {
@@ -1242,13 +1266,13 @@ public abstract class PlayerList {
File file = new File(this.server.getWorldServer(DimensionManager.OVERWORLD).getDataManager().getDirectory(), "stats");
File file1 = new File(file, uuid + ".json");

6
patches/server/0050-Purpur-Add-more-timings-timers.patch
View File

@ -1,4 +1,4 @@
From 198fff335f9fcf828187388cd74198a03a49f46a Mon Sep 17 00:00:00 2001
From d95050df2dd50d305522f68fb5652f125e4b1245 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Tue, 21 Apr 2020 15:49:52 +0200
Subject: [PATCH] Purpur Add more timings timers
@ -200,10 +200,10 @@ index a68fc11ec6..95dde66531 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0e1ab3fdff..80c097de77 100644
index ae823c2c9a..dcd689e1e6 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -980,7 +980,9 @@ public class WorldServer extends World {
@@ -986,7 +986,9 @@ public class WorldServer extends World {
return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
});
gameprofilerfiller.c("tickPassenger");