From b7746f4e04257d6579f3462bf41b0a9ab23105e4 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Tue, 28 Apr 2020 21:30:52 +0200
Subject: [PATCH] Update upstream
---
Tuinity | 2 +-
...Purpur-MC-4-Fix-Item-position-desync.patch | 29 -------------------
...Skip-events-if-there-s-no-listeners.patch} | 2 +-
...0057-Purpur-Add-more-timings-timers.patch} | 2 +-
...atch => 0058-Modify-default-configs.patch} | 2 +-
5 files changed, 4 insertions(+), 33 deletions(-)
delete mode 100644 patches/server/0056-Purpur-MC-4-Fix-Item-position-desync.patch
rename patches/server/{0057-Purpur-Skip-events-if-there-s-no-listeners.patch => 0056-Purpur-Skip-events-if-there-s-no-listeners.patch} (95%)
rename patches/server/{0058-Purpur-Add-more-timings-timers.patch => 0057-Purpur-Add-more-timings-timers.patch} (99%)
rename patches/server/{0059-Modify-default-configs.patch => 0058-Modify-default-configs.patch} (96%)
diff --git a/Tuinity b/Tuinity
index 003c5b34..4a88dc30 160000
--- a/Tuinity
+++ b/Tuinity
@@ -1 +1 @@
-Subproject commit 003c5b348a524dc0735f80a0e54dabe63a192a48
+Subproject commit 4a88dc309b02de49afba372bbdf43c94a6dc533c
diff --git a/patches/server/0056-Purpur-MC-4-Fix-Item-position-desync.patch b/patches/server/0056-Purpur-MC-4-Fix-Item-position-desync.patch
deleted file mode 100644
index 46ff09b4..00000000
--- a/patches/server/0056-Purpur-MC-4-Fix-Item-position-desync.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 67e2a0dc20dbbb616efa940d653a5a85971ae06a Mon Sep 17 00:00:00 2001
-From: tr7zw <tr7zw@live.de>
-Date: Tue, 21 Apr 2020 14:43:02 +0200
-Subject: [PATCH] Purpur MC-4 Fix - Item position desync
-
----
- src/main/java/net/minecraft/server/EntityTrackerEntry.java | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 5269e45a81..8928f23eba 100644
---- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-@@ -128,6 +128,12 @@ public class EntityTrackerEntry {
- j = MathHelper.d(this.tracker.pitch * 256.0F / 360.0F);
- Vec3D vec3d = this.tracker.getPositionVector().d(PacketPlayOutEntity.a(this.xLoc, this.yLoc, this.zLoc));
- boolean flag1 = vec3d.g() >= 7.62939453125E-6D;
-+ // Purpur start - fixes MC-4
-+ if (this.tracker instanceof EntityItem) {
-+ Vec3D loc = PacketPlayOutEntity.a(PacketPlayOutEntity.a(tracker.locX()), PacketPlayOutEntity.a(tracker.locY()), PacketPlayOutEntity.a(tracker.locZ()));
-+ tracker.setPosition(loc.getX(), loc.getY(), loc.getZ());
-+ }
-+ // Purpur end
- Packet<?> packet1 = null;
- boolean flag2 = flag1 || this.tickCounter % 60 == 0;
- boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1;
---
-2.25.1.windows.1
-
diff --git a/patches/server/0057-Purpur-Skip-events-if-there-s-no-listeners.patch b/patches/server/0056-Purpur-Skip-events-if-there-s-no-listeners.patch
similarity index 95%
rename from patches/server/0057-Purpur-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0056-Purpur-Skip-events-if-there-s-no-listeners.patch
index 5e572d6d..c900cdde 100644
--- a/patches/server/0057-Purpur-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0056-Purpur-Skip-events-if-there-s-no-listeners.patch
@@ -1,4 +1,4 @@
-From 130c34ea9f3c6dce072b57c659ddee5fcd88aaa5 Mon Sep 17 00:00:00 2001
+From 31e7d39e6df8dc1a1d03917440b550320637140f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 03:07:59 -0500
Subject: [PATCH] Purpur Skip events if there's no listeners
diff --git a/patches/server/0058-Purpur-Add-more-timings-timers.patch b/patches/server/0057-Purpur-Add-more-timings-timers.patch
similarity index 99%
rename from patches/server/0058-Purpur-Add-more-timings-timers.patch
rename to patches/server/0057-Purpur-Add-more-timings-timers.patch
index 5b686568..9c085d09 100644
--- a/patches/server/0058-Purpur-Add-more-timings-timers.patch
+++ b/patches/server/0057-Purpur-Add-more-timings-timers.patch
@@ -1,4 +1,4 @@
-From 41037c807466963b2360cddb62b882b998f90d1b Mon Sep 17 00:00:00 2001
+From 06cdc62ab432d4c593ef55fe503c0286e2f3cb69 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
diff --git a/patches/server/0059-Modify-default-configs.patch b/patches/server/0058-Modify-default-configs.patch
similarity index 96%
rename from patches/server/0059-Modify-default-configs.patch
rename to patches/server/0058-Modify-default-configs.patch
index d87eaf52..0bb92ce8 100644
--- a/patches/server/0059-Modify-default-configs.patch
+++ b/patches/server/0058-Modify-default-configs.patch
@@ -1,4 +1,4 @@
-From 9d14414d99e8d640b92a2f18750fbb9d9bffbe8d Mon Sep 17 00:00:00 2001
+From 9598fc9d72b633f2f49a52fd4941abe161ff232f Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Tue, 21 Apr 2020 16:14:10 +0200
Subject: [PATCH] Modify default configs