Updated Upstream (Tuinity)

Upstream has released updates that appear to apply and compile correctly

Tuinity Changes:
7220cb2 Re-add optimise poi access patch
d4da919 Re-add optimise worldserver notify
d3a0c9b Re-add remove streams for villager ai
This commit is contained in:
William Blake Galbreath
2021-07-05 01:13:08 -05:00
parent c830758f9f
commit b2fe934713
2 changed files with 1616 additions and 65 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 1430411a6f7ef3730d87c022774d7d623f2f415f..2d2da8f19c8845c5cfb4625ef7fed26212420eae 100644
index 509a4239dbda8d8d7edebfdc92bed84a13def369..018fe34b41612645579308a4d237a416a88d9102 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2233,7 +2233,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
@@ -2308,7 +2308,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
public class TrackedEntity {
@@ -94,7 +94,7 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 782f59ae094bac5c7c86b5c21418e9a7383d3226..1804be45445fee8ba4e30950792693ff47eca9a8 100644
index e5b1175d724598009d1276afece4b18980fdf823..1b609e93e29c505f8fefcf1c5991499cd0383f55 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -108,6 +108,49 @@ public class PurpurWorldConfig {