Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-01-23 16:41:48 +01:00
Code Issues Projects Releases Wiki Activity

Update Upstream

Browse Source
This commit is contained in:
tr7zw 2020-05-19 00:10:42 +02:00
parent 0b20dc7894
commit 8f81b240a4
17 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit 55e85bb7ccc30ec7384991a01a0e2cc4c4abc8de
Subproject commit 5cf4104e6eb407bff5a1fba85c68e3323f4e0961

6
patches/api/0031-Add-NBT-API-as-first-class-lib.patch
View File

@ -1,4 +1,4 @@
From 47fd3448b181a10447b707ecac4cf9421da55b12 Mon Sep 17 00:00:00 2001
From cd6e51c2047b927970f39546b1b0e79adb2e57fa Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Thu, 2 Apr 2020 18:49:56 +0200
Subject: [PATCH] Add NBT-API as first-class lib
@ -104,7 +104,7 @@ index 3f0f38031..771e7ea73 100644
+ // YAPFA end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 291285aa6..d25658392 100644
index eed5110bd..69d90f7d9 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -1,6 +1,10 @@
@ -118,7 +118,7 @@ index 291285aa6..d25658392 100644
import java.util.LinkedHashMap;
import java.util.List; // Paper
import java.util.Map;
@@ -832,4 +836,20 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -855,4 +859,20 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
return itemMeta.hasItemFlag(flag);
}
// Paper end

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

@ -1,4 +1,4 @@
From 2ed894eef36955e2a9c05077c73d62600aa42184 Mon Sep 17 00:00:00 2001
From a3282d8ebfd6a10c6ccb8ed3f5c42a8e09b78fa6 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 1ed6a67f62..d62d34cec0 100644
index d8c0790f30..b9ca31f0fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,12 @@
@ -48,7 +48,7 @@ index 1ed6a67f62..d62d34cec0 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -137,6 +138,10 @@
@@ -143,6 +144,10 @@
Please see https://www.spigotmc.org/go/maven for more information.
-->
@ -59,7 +59,7 @@ index 1ed6a67f62..d62d34cec0 100644
<repository>
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
@@ -152,15 +157,15 @@
@@ -158,15 +163,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 e9fbf5cbe9ed97ecf062439c9039149da0c9790a Mon Sep 17 00:00:00 2001
From 66972e785671f061e8d110f39a9bf9d0abf3fdf1 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 584f158aa0..5ae0227b9c 100644
index ecca604030..569ba87cee 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1614,7 +1614,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1617,7 +1617,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 770375ed42..aefa51aca4 100644
index aa8f135250..42a24f6d1e 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 {

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

@ -1,4 +1,4 @@
From e9878ce4910f031a0564e34a193d3884153cbdd2 Mon Sep 17 00:00:00 2001
From 590cd93be05350962a3c1423796a1521c5d4450a 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 fa324898f8..1bab7c7641 100644
index ecf7a8c6d9..64d5136346 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1026,9 +1026,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1045,9 +1045,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 b710a483377e0430fa2c11f029fa42f0bae8ec9c Mon Sep 17 00:00:00 2001
From c6cf67c185e236bd9e3fe3d6204c42a1b40be23e 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 5ae0227b9c..0e2fd93e39 100644
index 569ba87cee..2335f13c55 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1264,11 +1264,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1267,11 +1267,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 9e02ba53e20423a8e8d2f121ffea1bbe5c7602d4 Mon Sep 17 00:00:00 2001
From cd712e17a82a148245864d37ba8cf2721cb4167e 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 0e2fd93e39..2df0919a15 100644
index 2335f13c55..049860a211 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1473,6 +1473,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1476,6 +1476,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/0026-EMC-Tweak-Explosions.patch
View File

@ -1,4 +1,4 @@
From 37f94dee7236d3057e39cb88c0bb6ceca5af1309 Mon Sep 17 00:00:00 2001
From e3347077fdfae725f03834cb0c7e995ae188057f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Jun 2018 22:35:39 -0400
Subject: [PATCH] EMC Tweak Explosions
@ -8,7 +8,7 @@ Subject: [PATCH] EMC Tweak Explosions
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index a353f3d5fa..b1ac7d1046 100644
index 2552f860ff..cfe37b7ff9 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -97,6 +97,7 @@ public class Explosion {
@ -19,7 +19,7 @@ index a353f3d5fa..b1ac7d1046 100644
for (int k = 0; k < 16; ++k) {
for (i = 0; i < 16; ++i) {
for (j = 0; j < 16; ++j) {
@@ -141,6 +142,7 @@ public class Explosion {
@@ -142,6 +143,7 @@ public class Explosion {
}
}
}
@ -27,7 +27,7 @@ index a353f3d5fa..b1ac7d1046 100644
this.blocks.addAll(set);
float f3 = this.size * 2.0F;
@@ -155,7 +157,7 @@ public class Explosion {
@@ -156,7 +158,7 @@ public class Explosion {
List<Entity> list = this.world.getEntities(this.source, new AxisAlignedBB((double) i, (double) l, (double) j1, (double) j, (double) i1, (double) k1), new com.google.common.base.Predicate<Entity>() {
@Override
public boolean apply(Entity entity) {
@ -36,7 +36,7 @@ index a353f3d5fa..b1ac7d1046 100644
}
});
// Paper end
@@ -219,7 +221,7 @@ public class Explosion {
@@ -220,7 +222,7 @@ public class Explosion {
boolean flag1 = this.b != Explosion.Effect.NONE;
if (flag) {

6
patches/server/0033-Don-t-save-Fireworks-and-Arrows.patch
View File

@ -1,4 +1,4 @@
From b8f62136b0a606951506b6013c3e88bb4e07880a Mon Sep 17 00:00:00 2001
From 11403e9f5cd346dc248cfec0af4ee2c29f061ee0 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Wed, 26 Feb 2020 21:39:58 +0100
Subject: [PATCH] Don't save Fireworks and Arrows
@ -8,10 +8,10 @@ Subject: [PATCH] Don't save Fireworks and Arrows
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0876c84025..89cbeb0b65 100644
index 352e8699f1..875afe1234 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1616,7 +1616,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1625,7 +1625,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean c(NBTTagCompound nbttagcompound) {

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

@ -1,4 +1,4 @@
From f93f942cf91b25a278926807bbf696ebfed23af2 Mon Sep 17 00:00:00 2001
From db475ecf5d7f8a1a5dc39cf52047ac46dc644dda 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 2df0919a15..6f09157927 100644
index 049860a211..3daa46271b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -890,6 +890,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -893,6 +893,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 2df0919a15..6f09157927 100644
public void run() {
try {
@@ -954,9 +956,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 2df0919a15..6f09157927 100644
this.methodProfiler.exitEnter("nextTickWait");
this.ac = true;
this.ab = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
@@ -964,6 +970,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;

8
patches/server/0036-Add-config-yapfa-command-and-basic-settings.patch
View File

@ -1,4 +1,4 @@
From d5b2485cb8afbd2d4e2f84d9ff7b11c174140f7e Mon Sep 17 00:00:00 2001
From f570f6f636490560894bb5fec5f25374d41878e0 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Thu, 5 Mar 2020 22:31:50 +0100
Subject: [PATCH] Add config, yapfa command and basic settings
@ -396,10 +396,10 @@ index c95e1722ac..7297f87189 100644
this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 89cbeb0b65..29cc192682 100644
index 875afe1234..bf68bb9e81 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -754,6 +754,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -763,6 +763,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
try {
this.inLava = false;
@ -407,7 +407,7 @@ index 89cbeb0b65..29cc192682 100644
this.checkBlockCollisions();
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision");
@@ -883,9 +884,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -892,9 +893,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private Vec3D e(Vec3D vec3d) {
AxisAlignedBB axisalignedbb = this.getBoundingBox();
VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);

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

@ -1,4 +1,4 @@
From 0a4d5989660b54e0a6c936c7f2778581f4edaa27 Mon Sep 17 00:00:00 2001
From 2443668f9b71af2bcdd322b5c629d12dfd7fd019 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 6f09157927..493d2dd31c 100644
index 3daa46271b..fb21fba051 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 6f09157927..493d2dd31c 100644
private ServerConnection serverConnection;
public final WorldLoadListenerFactory worldLoadListenerFactory;
private final ServerPing serverPing = new ServerPing();
@@ -953,7 +953,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;

12
patches/server/0038-Remove-Stream-usage.patch
View File

@ -1,4 +1,4 @@
From c8b458cafe7b179fecd8022b3911f939effdf33a Mon Sep 17 00:00:00 2001
From 4669f5ff3eccfdbae6708f50213bfb6fcaece907 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Mon, 23 Mar 2020 18:20:58 +0100
Subject: [PATCH] Remove Stream usage
@ -145,10 +145,10 @@ index 0000000000..d67753937f
+
+}
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index e40375b67a..2a5574be3a 100644
index d051a54aa0..48f764ef02 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -92,7 +92,7 @@ public class Block implements IMaterial {
@@ -99,7 +99,7 @@ public class Block implements IMaterial {
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
@ -269,7 +269,7 @@ index f0d7a91fa0..15e2439d69 100644
public Stream<MinecraftKey> c() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 29cc192682..4805dc1ee9 100644
index bf68bb9e81..9d8546cd1d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -13,6 +13,7 @@ import java.util.Locale;
@ -280,7 +280,7 @@ index 29cc192682..4805dc1ee9 100644
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
@@ -884,31 +885,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -893,31 +894,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private Vec3D e(Vec3D vec3d) {
AxisAlignedBB axisalignedbb = this.getBoundingBox();
VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
@ -356,7 +356,7 @@ index 29cc192682..4805dc1ee9 100644
}
return vec3d1;
@@ -931,6 +961,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -940,6 +970,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return a(vec3d, axisalignedbb, world, voxelshapecollision, streamaccumulator);
}
}

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

@ -1,4 +1,4 @@
From 44f93c065e5d6910a07e24d03814950bcdb87116 Mon Sep 17 00:00:00 2001
From e8f6ba8d82555ad2b33a6871d649b4cad32caf93 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 25c8e55b81..481732b0c5 100644
index 82a623d63d..0e1ab3fdff 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -275,6 +275,13 @@ public class WorldServer extends World {
@@ -384,6 +384,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 b6abcfd21b0507e516aaaa140522cdff737851e5 Mon Sep 17 00:00:00 2001
From 6ad7b7497e3c376674145ed58f375ba082a18708 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 d62d34cec0..5e1ebf8d51 100644
index b9ca31f0fb..c76bae0ca0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,6 +287,10 @@
@@ -293,6 +293,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 c5fa28bcf9ab34ec60454e1bfd0ac9cddf88e093 Mon Sep 17 00:00:00 2001
From bb740c4b93bccde23565a0097224cba6f65bc052 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 d1533a8265..38e7fa8c65 100644
index 9b726de6da..a06340d0b3 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 d1533a8265..38e7fa8c65 100644
import javax.annotation.Nullable;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -1185,6 +1187,28 @@ public abstract class PlayerList {
@@ -1187,6 +1189,28 @@ public abstract class PlayerList {
if (team != null) scoreboard.removeTeam(team);
}
// Paper end
@ -224,7 +224,7 @@ index d1533a8265..38e7fa8c65 100644
}
// Paper end
@@ -1224,13 +1248,13 @@ public abstract class PlayerList {
@@ -1226,13 +1250,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 da98bed30d173072349655839ffdf3193fec2851 Mon Sep 17 00:00:00 2001
From 198fff335f9fcf828187388cd74198a03a49f46a 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 481732b0c5..443e2b8869 100644
index 0e1ab3fdff..80c097de77 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -871,7 +871,9 @@ public class WorldServer extends World {
@@ -980,7 +980,9 @@ public class WorldServer extends World {
return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
});
gameprofilerfiller.c("tickPassenger");