Drop Unsafe UUID & Proxy Data Patches (#357)

YatopiaMC · Jan 24, 2021 · aebd71f · aebd71f
1 parent 188fc31
commit aebd71f
Show file tree

Hide file tree

Showing 46 changed files with 63 additions and 434 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,3 +60,4 @@ yatopia-launcher.jar
 last-paper
 !upstreamConfig/*
 !upstreamCommits/*
+testserver/
diff --git a/PATCHES.md b/PATCHES.md
diff --git a/...es/api/0007-PlayerAttackEntityEvent.patch → ...es/api/0006-PlayerAttackEntityEvent.patch b/...es/api/0007-PlayerAttackEntityEvent.patch → ...es/api/0006-PlayerAttackEntityEvent.patch
diff --git a/patches/api/0006-ProxyForwardDataEvent.patch b/patches/api/0006-ProxyForwardDataEvent.patch
diff --git a/...hes/api/0008-Disable-reload-command.patch → ...hes/api/0007-Disable-reload-command.patch b/...hes/api/0008-Disable-reload-command.patch → ...hes/api/0007-Disable-reload-command.patch
diff --git a/...hly-optimize-VillagePlace-filtering.patch → ...hly-optimize-VillagePlace-filtering.patch b/...hly-optimize-VillagePlace-filtering.patch → ...hly-optimize-VillagePlace-filtering.patch
diff --git a/patches/server/0028-Use-offline-uuids-if-we-need-to.patch b/patches/server/0028-Use-offline-uuids-if-we-need-to.patch
diff --git a/patches/server/0030-Optimise-portals.patch → patches/server/0029-Optimise-portals.patch b/patches/server/0030-Optimise-portals.patch → patches/server/0029-Optimise-portals.patch
diff --git a/...0031-Nuke-streams-off-BlockPosition.patch → ...0030-Nuke-streams-off-BlockPosition.patch b/...0031-Nuke-streams-off-BlockPosition.patch → ...0030-Nuke-streams-off-BlockPosition.patch
diff --git a/...32-Nuke-streams-off-SectionPosition.patch → ...31-Nuke-streams-off-SectionPosition.patch b/...32-Nuke-streams-off-SectionPosition.patch → ...31-Nuke-streams-off-SectionPosition.patch
diff --git a/...p-wasting-resources-on-JsonList-get.patch → ...p-wasting-resources-on-JsonList-get.patch b/...p-wasting-resources-on-JsonList-get.patch → ...p-wasting-resources-on-JsonList-get.patch
diff --git a/...Fix-LightEngineThreaded-memory-leak.patch → ...Fix-LightEngineThreaded-memory-leak.patch b/...Fix-LightEngineThreaded-memory-leak.patch → ...Fix-LightEngineThreaded-memory-leak.patch
diff --git a/patches/server/0034-ProxyForwardDataEvent.patch b/patches/server/0034-ProxyForwardDataEvent.patch
diff --git a/...espect-PlayerKickEvent-leaveMessage.patch → ...espect-PlayerKickEvent-leaveMessage.patch b/...espect-PlayerKickEvent-leaveMessage.patch → ...espect-PlayerKickEvent-leaveMessage.patch
diff --git a/...0037-Shutdown-Bootstrap-thread-pool.patch → ...0035-Shutdown-Bootstrap-thread-pool.patch b/...0037-Shutdown-Bootstrap-thread-pool.patch → ...0035-Shutdown-Bootstrap-thread-pool.patch
diff --git a/patches/server/0038-Optimize-Villagers.patch → patches/server/0036-Optimize-Villagers.patch b/patches/server/0038-Optimize-Villagers.patch → patches/server/0036-Optimize-Villagers.patch
diff --git a/...t-command-for-multiple-additions-re.patch → ...t-command-for-multiple-additions-re.patch b/...t-command-for-multiple-additions-re.patch → ...t-command-for-multiple-additions-re.patch
@@ -111,7 +111,7 @@ index 893d2c1c74ed28dcdb83b71762ccdcbfd50a8f9d..107091a4cae0e4eaba93f69ae91239ab
 
      private static int b(CommandListenerWrapper commandlistenerwrapper) throws CommandSyntaxException {
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index a191693b754724f2a5a3cd2a39e5b2171bddb6a8..434cfd0a224a8dc1f13809edcd4b98f0c7aa0899 100644
+index 91c2756a8708a2f4154905baec20b9ae484fea0d..7a6d5521e42a31723b4f006d0fcf618fd42050e4 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -78,6 +78,7 @@ public abstract class EntityHuman extends EntityLiving {

diff --git a/...server/0040-PlayerAttackEntityEvent.patch → ...server/0038-PlayerAttackEntityEvent.patch b/...server/0040-PlayerAttackEntityEvent.patch → ...server/0038-PlayerAttackEntityEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAttackEntityEvent
 Added per request
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 434cfd0a224a8dc1f13809edcd4b98f0c7aa0899..d2b3db34d69269a220185d203bc1232042a9e437 100644
+index 7a6d5521e42a31723b4f006d0fcf618fd42050e4..9689ebc0089f7586bad4ce4958cd792ddde50334 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1071,12 +1071,50 @@ public abstract class EntityHuman extends EntityLiving {

diff --git a/...-Ensure-pools-create-daemon-threads.patch → ...-Ensure-pools-create-daemon-threads.patch b/...-Ensure-pools-create-daemon-threads.patch → ...-Ensure-pools-create-daemon-threads.patch
@@ -7,7 +7,7 @@ If only 1 non-daemon thread is left to run when the server is shutting down, the
 This patche ensures that executors make daemon threads.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index bb45fc83d81948c84bc721961474e5e806ab404a..847122f76f6d951b24b22c86276140e02aaf37d6 100644
+index d987483255195c0bde713a92676baced1eaff2b3..e081905af0abbad0cf9011075a6380ef652924a7 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -108,7 +108,11 @@ public class LoginListener implements PacketLoginInListener {

diff --git a/...ver/0042-Add-IntelliJ-IDEA-runnable.patch → ...ver/0040-Add-IntelliJ-IDEA-runnable.patch b/...ver/0042-Add-IntelliJ-IDEA-runnable.patch → ...ver/0040-Add-IntelliJ-IDEA-runnable.patch
diff --git a/...ndsException-when-sending-too-many-.patch → ...ndsException-when-sending-too-many-.patch b/...ndsException-when-sending-too-many-.patch → ...ndsException-when-sending-too-many-.patch