From 55f4019aabf584fa563eeb5b7d1b7eafa5dc91b5 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sun, 22 Mar 2020 16:40:40 +0100 Subject: [PATCH] Update upstream --- Tuinity | 2 +- patches/api/0032-Add-getLastTickMs-api.patch | 6 +++--- .../0039-Don-t-save-Fireworks-and-Arrows.patch | 6 +++--- patches/server/0041-Add-getLastTickMs-api.patch | 10 +++++----- ...config-yapfa-command-and-basic-settings.patch | 16 ++++++++-------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Tuinity b/Tuinity index d16b7882..bf2a4dcb 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit d16b7882fc663ed975daf74091449c1927d0242a +Subproject commit bf2a4dcb7c0050a33e59c3f10f83bf68074924fb diff --git a/patches/api/0032-Add-getLastTickMs-api.patch b/patches/api/0032-Add-getLastTickMs-api.patch index 31f183f3..307fbc17 100644 --- a/patches/api/0032-Add-getLastTickMs-api.patch +++ b/patches/api/0032-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From f729f3eb13144eb45278d3f0671f44339dd55552 Mon Sep 17 00:00:00 2001 +From 60a34cc1a5fa232371cc3f2c6c4f530909e7c70b Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 21:13:14 +0100 Subject: [PATCH] Add getLastTickMs() api @@ -28,10 +28,10 @@ index b9973406..610bd5b1 100644 @NotNull public static Server.Spigot spigot() { diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 80f9abdc..7b6cbe71 100644 +index 55ec8d2d..ba7ef28b 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1456,4 +1456,15 @@ public interface Server extends PluginMessageRecipient { +@@ -1464,4 +1464,15 @@ public interface Server extends PluginMessageRecipient { */ int getCurrentTick(); // Paper end diff --git a/patches/server/0039-Don-t-save-Fireworks-and-Arrows.patch b/patches/server/0039-Don-t-save-Fireworks-and-Arrows.patch index 2dd58af4..c7662cd9 100644 --- a/patches/server/0039-Don-t-save-Fireworks-and-Arrows.patch +++ b/patches/server/0039-Don-t-save-Fireworks-and-Arrows.patch @@ -1,4 +1,4 @@ -From 42b73c07d1ef71fd082f14c8eb6682817d33ea68 Mon Sep 17 00:00:00 2001 +From 732cfeed9395bbcedcb3792517e6503172aa05ea Mon Sep 17 00:00:00 2001 From: tr7zw 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 181f1742..d2a224a8 100644 +index 3cdba5c42..429666193 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 +@@ -1636,7 +1636,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } public boolean c(NBTTagCompound nbttagcompound) { diff --git a/patches/server/0041-Add-getLastTickMs-api.patch b/patches/server/0041-Add-getLastTickMs-api.patch index bed061da..492f9895 100644 --- a/patches/server/0041-Add-getLastTickMs-api.patch +++ b/patches/server/0041-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From 03a99f384fef93ce99164346e625053155eb7438 Mon Sep 17 00:00:00 2001 +From fa0f4dd513ddbd9d30e04835d4ff83d0a94e882d Mon Sep 17 00:00:00 2001 From: tr7zw 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 376cf955..0276abe1 100644 +index 376cf9556..0276abe1c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -883,6 +883,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 5 Mar 2020 22:31:50 +0100 Subject: [PATCH] Add config, yapfa command and basic settings @@ -15,7 +15,7 @@ Subject: [PATCH] Add config, yapfa command and basic settings diff --git a/src/main/java/de/tr7zw/yapfa/YapfaCommand.java b/src/main/java/de/tr7zw/yapfa/YapfaCommand.java new file mode 100644 -index 00000000..76d83f3d +index 000000000..76d83f3db --- /dev/null +++ b/src/main/java/de/tr7zw/yapfa/YapfaCommand.java @@ -0,0 +1,129 @@ @@ -151,7 +151,7 @@ index 00000000..76d83f3d \ No newline at end of file diff --git a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java new file mode 100644 -index 00000000..9711cbc5 +index 000000000..9711cbc52 --- /dev/null +++ b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java @@ -0,0 +1,219 @@ @@ -376,7 +376,7 @@ index 00000000..9711cbc5 +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 610826c9..2ed69f56 100644 +index 610826c9e..2ed69f567 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -194,6 +194,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -396,10 +396,10 @@ index 610826c9..2ed69f56 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 d2a224a8..45fdcee0 100644 +index 429666193..2d97ecacb 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -761,6 +761,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -781,6 +781,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke try { this.inLava = false; @@ -407,7 +407,7 @@ index d2a224a8..45fdcee0 100644 this.checkBlockCollisions(); } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision"); -@@ -885,7 +886,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -905,7 +906,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this); VoxelShape voxelshape = this.world.getWorldBorder().a(); Stream stream = VoxelShapes.c(voxelshape, VoxelShapes.a(axisalignedbb.shrink(1.0E-7D)), OperatorBoolean.AND) ? Stream.empty() : Stream.of(voxelshape); @@ -417,7 +417,7 @@ index d2a224a8..45fdcee0 100644 Vec3D vec3d1 = vec3d.g() == 0.0D ? vec3d : a(this, vec3d, axisalignedbb, this.world, voxelshapecollision, streamaccumulator); boolean flag = vec3d.x != vec3d1.x; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 5b402690..839b0f51 100644 +index 5b402690d..839b0f514 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -246,6 +246,7 @@ public abstract class EntityLiving extends Entity {