From aa52416b833287ab5b0a3107311d966fc876da8d Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 5 May 2020 20:06:36 +0200 Subject: [PATCH] Update upstream --- Tuinity | 2 +- patches/server/0038-Don-t-save-Fireworks-and-Arrows.patch | 6 +++--- ...0041-Add-config-yapfa-command-and-basic-settings.patch | 8 ++++---- patches/server/0044-Remove-Stream-usage.patch | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Tuinity b/Tuinity index 4a88dc30..e00a4e3c 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit 4a88dc309b02de49afba372bbdf43c94a6dc533c +Subproject commit e00a4e3c32a410b7c3668d0a267044da5df575f6 diff --git a/patches/server/0038-Don-t-save-Fireworks-and-Arrows.patch b/patches/server/0038-Don-t-save-Fireworks-and-Arrows.patch index 24895937..52a8c944 100644 --- a/patches/server/0038-Don-t-save-Fireworks-and-Arrows.patch +++ b/patches/server/0038-Don-t-save-Fireworks-and-Arrows.patch @@ -1,4 +1,4 @@ -From ca9d0b939fedae215d08cd309fdc0f664d81b5a8 Mon Sep 17 00:00:00 2001 +From 64f69f1c740e8d845efadc3b673a8f431774ec58 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 da41e76da0..05d1c5b72f 100644 +index cf3c329f84..9e034293ed 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1626,7 +1626,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1614,7 +1614,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } public boolean c(NBTTagCompound nbttagcompound) { diff --git a/patches/server/0041-Add-config-yapfa-command-and-basic-settings.patch b/patches/server/0041-Add-config-yapfa-command-and-basic-settings.patch index 37d4d86a..3729f374 100644 --- a/patches/server/0041-Add-config-yapfa-command-and-basic-settings.patch +++ b/patches/server/0041-Add-config-yapfa-command-and-basic-settings.patch @@ -1,4 +1,4 @@ -From eeae8210a97cd0b81adb1bb350072cf9b69bd60d Mon Sep 17 00:00:00 2001 +From adf5af223a1c7f111f29ca848a714ad5979d70dc Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 22:31:50 +0100 Subject: [PATCH] Add config, yapfa command and basic settings @@ -396,10 +396,10 @@ index 3c8e231c6a..a2864c9534 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 05d1c5b72f..b23669c27f 100644 +index 9e034293ed..e3d58492c1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -765,6 +765,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -753,6 +753,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke try { this.inLava = false; @@ -407,7 +407,7 @@ index 05d1c5b72f..b23669c27f 100644 this.checkBlockCollisions(); } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision"); -@@ -896,7 +897,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -884,7 +885,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); diff --git a/patches/server/0044-Remove-Stream-usage.patch b/patches/server/0044-Remove-Stream-usage.patch index 0da2d44a..ca21b272 100644 --- a/patches/server/0044-Remove-Stream-usage.patch +++ b/patches/server/0044-Remove-Stream-usage.patch @@ -1,4 +1,4 @@ -From 2139d843a596350c00bbfc8ad34eba5488f38108 Mon Sep 17 00:00:00 2001 +From 1ae0b3425b07a6042a563ebc832e4983d44f49fd Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 23 Mar 2020 18:20:58 +0100 Subject: [PATCH] Remove Stream usage @@ -269,7 +269,7 @@ index f0d7a91fa0..15e2439d69 100644 public Stream c() { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b23669c27f..eed28f5d51 100644 +index e3d58492c1..e549d44402 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 b23669c27f..eed28f5d51 100644 import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; -@@ -895,31 +896,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -883,31 +884,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 b23669c27f..eed28f5d51 100644 } return vec3d1; -@@ -942,6 +972,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -930,6 +960,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke return a(vec3d, axisalignedbb, world, voxelshapecollision, streamaccumulator); } }