Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
33d4f608b fix stupid legacy chat garbage
a1eebfea9 fix #5212 and #5213

Tuinity Changes:
2f298d30e Fix getEntities for ender dragon parts
This commit is contained in:
jmp
2021-02-22 01:45:48 -08:00
parent 14906a1666
commit 83695886bc
16 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -7537,10 +7537,10 @@ index 0000000000000000000000000000000000000000..002abb3cbf0f742e685f2f043d2600de
+}
diff --git a/src/main/java/com/tuinity/tuinity/world/ChunkEntitySlices.java b/src/main/java/com/tuinity/tuinity/world/ChunkEntitySlices.java
new file mode 100644
index 0000000000000000000000000000000000000000..9cc14620d26d63a9e8fec7735625b22411b43e98
index 0000000000000000000000000000000000000000..7aca38ebeb21af1a952e72c7f3906ff4970aca0e
--- /dev/null
+++ b/src/main/java/com/tuinity/tuinity/world/ChunkEntitySlices.java
@@ -0,0 +1,401 @@
@@ -0,0 +1,399 @@
+package com.tuinity.tuinity.world;
+
+import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
@@ -7877,11 +7877,9 @@ index 0000000000000000000000000000000000000000..9cc14620d26d63a9e8fec7735625b224
+ continue;
+ }
+
+ if (predicate != null && !predicate.test(entity)) {
+ continue;
+ }
+
+ into.add(entity);
+ if (predicate == null || predicate.test(entity)) {
+ into.add(entity);
+ } // else: continue to test the ender dragon parts
+
+ if (entity instanceof EntityEnderDragon) {
+ for (final EntityComplexPart part : ((EntityEnderDragon)entity).children) {
@@ -13758,7 +13756,7 @@ index 49008cdec739b19409fdaf1b0ed806a6c0e93200..61570ab947b5a153a4c2bcb5a09344f0
}
// Paper end - optimised tracker
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4e3aa45856015d55bd87d43738533e8d7b01beda..674889b81ec338338d2d21d89bd4613f89a77a9e 100644
index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d26708986c1b6e2 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -419,7 +419,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -14124,7 +14122,7 @@ index 114e986e5132e5e4bb42d0f08a067429bce53ba6..05656ea8448aa569e8dd480461e2d5f7
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index e1ab296811081a0d1449d48d16de065c070fde23..e86ab7dd06df2c6973456def1b43dfb5518ec739 100644
index 4a20235f34dc272b0a7939b97cf3448919c4f753..60b2e560bbf4c5303e9334a496c6ced0e3c88b19 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -100,6 +100,7 @@ public abstract class PlayerList {
@@ -14135,7 +14133,7 @@ index e1ab296811081a0d1449d48d16de065c070fde23..e86ab7dd06df2c6973456def1b43dfb5
EntityPlayer prev = pendingPlayers.put(entityplayer.getUniqueID(), entityplayer);// Paper
if (prev != null) {
disconnectPendingPlayer(prev);
@@ -639,7 +640,7 @@ public abstract class PlayerList {
@@ -640,7 +641,7 @@ public abstract class PlayerList {
SocketAddress socketaddress = loginlistener.networkManager.getSocketAddress();
EntityPlayer entity = new EntityPlayer(this.server, this.server.getWorldServer(World.OVERWORLD), gameprofile, new PlayerInteractManager(this.server.getWorldServer(World.OVERWORLD)));

2
patches/server/0008-AFK-API.patch
View File

@@ -149,7 +149,7 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 674889b81ec338338d2d21d89bd4613f89a77a9e..07a481d9f49028cc8911e8bd348b2d2996d565ec 100644
index 8c8359bb696afb579796b23a4d26708986c1b6e2..72bd179a0b2a07be3924b37fa9fb853df50a454d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -252,6 +252,12 @@ public class PlayerConnection implements PacketListenerPlayIn {

6
patches/server/0016-Player-invulnerabilities.patch
View File

@@ -67,7 +67,7 @@ index 771f634a06eca998853830d78b4d1546dd2b4c67..f4f6e85bd98ce57bf2daeb9ea30bccc2
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 07a481d9f49028cc8911e8bd348b2d2996d565ec..3839f0ab12b42ddcafc6b469d6fafeee9781ae10 100644
index 72bd179a0b2a07be3924b37fa9fb853df50a454d..797b09fa01b039bd5f8ab30f0c4686dc7e1efe71 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1733,6 +1733,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -79,10 +79,10 @@ index 07a481d9f49028cc8911e8bd348b2d2996d565ec..3839f0ab12b42ddcafc6b469d6fafeee
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index e86ab7dd06df2c6973456def1b43dfb5518ec739..757238ed5a7b62bcea8a9b57030dee21a2d7ad9e 100644
index 60b2e560bbf4c5303e9334a496c6ced0e3c88b19..6beb06bfce96d364122ceda6d702cfb7315e4312 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -917,6 +917,8 @@ public abstract class PlayerList {
@@ -918,6 +918,8 @@ public abstract class PlayerList {
}
// Paper end

2
patches/server/0019-Alternative-Keepalive-Handling.patch
View File

@@ -17,7 +17,7 @@ index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3839f0ab12b42ddcafc6b469d6fafeee9781ae10..917609140f5d5200c918bd467998736dd504d909 100644
index 797b09fa01b039bd5f8ab30f0c4686dc7e1efe71..9b509d7aeba8297107c74f8a1429edc25edfb5ee 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -86,6 +86,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
patches/server/0045-Signs-allow-color-codes.patch
View File

@@ -17,7 +17,7 @@ index f4f6e85bd98ce57bf2daeb9ea30bccc25fdae8ec..a76d4ed8a0baa09340fcf58e647afa1c
this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 917609140f5d5200c918bd467998736dd504d909..bce0c34a7acf686e715f6cfc73098f5840f269ca 100644
index 9b509d7aeba8297107c74f8a1429edc25edfb5ee..09c084e212fd6250656ad6c60e9884d2e23fe348 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2903,6 +2903,15 @@ public class PlayerConnection implements PacketListenerPlayIn {

4
patches/server/0054-Add-permission-for-F3-N-debug.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 757238ed5a7b62bcea8a9b57030dee21a2d7ad9e..3bf7fcc900fdb6d8cf155cb04bd4d4ce9142f898 100644
index 6beb06bfce96d364122ceda6d702cfb7315e4312..f8a3475af20ceed0e4ad5b6d779e848af43114e7 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1076,6 +1076,7 @@ public abstract class PlayerList {
@@ -1077,6 +1077,7 @@ public abstract class PlayerList {
} else {
b0 = (byte) (24 + i);
}

2
patches/server/0083-Allow-color-codes-in-books.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index bce0c34a7acf686e715f6cfc73098f5840f269ca..a5952ce1e6d0f48d7801104bdbd05eb21a0df4de 100644
index 09c084e212fd6250656ad6c60e9884d2e23fe348..3c63788c7119d1fcd4c08f4e1d6e93da23e50e08 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1054,7 +1054,8 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
patches/server/0084-Entity-lifespan.patch
View File

@@ -92,7 +92,7 @@ index 9807441d53fcf4ef7aaffe3801542f5a371eb7af..43cdeaae22bf020d0b3c1e1c56e65e73
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a5952ce1e6d0f48d7801104bdbd05eb21a0df4de..cd13a09ace9341e6741956058c0faca16fe6ac16 100644
index 3c63788c7119d1fcd4c08f4e1d6e93da23e50e08..7ffc3c1d41b3b8fdd8f0e48f991f0ae4e1294c53 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2299,6 +2299,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
patches/server/0097-Allow-anvil-colors.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow anvil colors
diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
index 4aa6b035a6a8ea39401c6566cd286de39f60e942..e6c59ca0147202daa37f7c6aa5da25b36df35ee8 100644
index 4aa6b035a6a8ea39401c6566cd286de39f60e942..bae418eb43a413b09adbfa1f87e5e20052289a21 100644
--- a/src/main/java/net/minecraft/server/ContainerAnvil.java
+++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
@@ -10,6 +10,14 @@ import org.apache.logging.log4j.Logger;

2
patches/server/0102-Ridables.patch
View File

@@ -4956,7 +4956,7 @@ index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cb
+ }
+}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cd13a09ace9341e6741956058c0faca16fe6ac16..6d6b9734292d2c8e2213865760569976c181a4eb 100644
index 7ffc3c1d41b3b8fdd8f0e48f991f0ae4e1294c53..050d6db2a6a0bd5922efd720f5a0cd99b3090144 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2308,6 +2308,8 @@ public class PlayerConnection implements PacketListenerPlayIn {

4
patches/server/0146-Spread-out-and-optimise-player-list-ticks.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Spread out and optimise player list ticks
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 3bf7fcc900fdb6d8cf155cb04bd4d4ce9142f898..381595db593fdddb195a07d1352ff514ac281c43 100644
index f8a3475af20ceed0e4ad5b6d779e848af43114e7..47f916a7fc2581720b628ffa6c720af2e459fd92 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -73,7 +73,7 @@ public abstract class PlayerList {
@@ -17,7 +17,7 @@ index 3bf7fcc900fdb6d8cf155cb04bd4d4ce9142f898..381595db593fdddb195a07d1352ff514
// CraftBukkit start
private CraftServer cserver;
@@ -931,22 +931,23 @@ public abstract class PlayerList {
@@ -932,22 +932,23 @@ public abstract class PlayerList {
}
public void tick() {

4
patches/server/0152-Implement-TPSBar.patch
View File

@@ -37,10 +37,10 @@ index eea187723c1931a5db9a2d79a1abddd664d890a1..33d43478b1bc4b0ca3f16ba80e0cd99b
this.isRestarting = isRestarting;
if (flag) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 381595db593fdddb195a07d1352ff514ac281c43..e765d0c7ea5ee030ac718ebd7572e1a6719aa84c 100644
index 47f916a7fc2581720b628ffa6c720af2e459fd92..8f60273865d9f49420e25da71edc61175896fc62 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -516,6 +516,8 @@ public abstract class PlayerList {
@@ -517,6 +517,8 @@ public abstract class PlayerList {
if (entityplayer.didPlayerJoinEvent) cserver.getPluginManager().callEvent(playerQuitEvent); // Paper - if we disconnected before join ever fired, don't fire quit
entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());

2
patches/server/0154-PlayerBookTooLargeEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6d6b9734292d2c8e2213865760569976c181a4eb..024f5769035e978c2e7749526329a78a70ae7887 100644
index 050d6db2a6a0bd5922efd720f5a0cd99b3090144..f6b120e2dc7f925cb0af11e7599f16194f7ca6c6 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -966,6 +966,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
patches/server/0165-Fix-PlayerEditBookEvent-not-saving-new-book.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerEditBookEvent not saving new book
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 024f5769035e978c2e7749526329a78a70ae7887..2e9fe1a2390eb109d3737797be777f6e04210eff 100644
index f6b120e2dc7f925cb0af11e7599f16194f7ca6c6..7d0881aeb8ce0314dd5188e5320791a5fa4baadb 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1061,7 +1061,7 @@ public class PlayerConnection implements PacketListenerPlayIn {