diff --git a/Paper b/Paper index 9c9583cd2..fb36f15d6 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 9c9583cd2b6e369eab7b5c61c33282b6a1d5ce8a +Subproject commit fb36f15d6c7825c5133580678c05d3047552c77e diff --git a/current-paper b/current-paper index ace707dbf..5c569dfae 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.4--cfa07cbe0585adc3e575cf7c520dc0c17936b9f4 +1.16.4--8ff078813db86d42db9fd900c0f093f05b9594c4 diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index f8b266ba7..46526ef2c 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -8424,10 +8424,10 @@ index b88bd19fc3ebaf3ae467b5ad35a155505db77e6c..c57e7e1bccfc3a0cccfbaca44d9f369e } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 976c44c8eeecc513fa11de55b80317550f621407..27c368bf19292e1076e1990a1d733eeac33ec0f4 100644 +index 7240b885d96eb2df187b6229449af1a893a4524e..2c276971d47e48b39afa176994eba5747a3a3951 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -525,6 +525,174 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -527,6 +527,174 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } } @@ -9733,7 +9733,7 @@ index 1558c5f8256f50be6850f1d7f70eee3e8ec76496..b92ca4a6de01f3f86367fb8dfe3591b0 Vec3D vec3d = new Vec3D(((double) pathpoint.a + this.a.locX()) / 2.0D, ((double) pathpoint.b + this.a.locY()) / 2.0D, ((double) pathpoint.c + this.a.locZ()) / 2.0D); diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515f38e5395 100644 +index fb1e3c705b8abee13695762cdfd0e9f1bfdb5ad8..6a0ec0105399066dede622b45c9471b32c162cf6 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -27,6 +27,8 @@ import org.apache.logging.log4j.Logger; @@ -9849,7 +9849,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515 try { a(packet, this.packetListener); } catch (CancelledPacketHandleException cancelledpackethandleexception) { -@@ -220,7 +310,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -222,7 +312,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { MCUtil.isMainThread() && packet.isReady() && this.packetQueue.isEmpty() && (packet.getExtraPackets() == null || packet.getExtraPackets().isEmpty()) ))) { @@ -9858,7 +9858,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515 return; } // write the packets to the queue, then flush - antixray hooks there already -@@ -246,6 +336,14 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -248,6 +338,14 @@ public class NetworkManager extends SimpleChannelInboundHandler> { private void dispatchPacket(Packet packet, @Nullable GenericFutureListener> genericFutureListener) { this.b(packet, genericFutureListener); } // Paper - OBFHELPER private void b(Packet packet, @Nullable GenericFutureListener> genericfuturelistener) { @@ -9873,7 +9873,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515 EnumProtocol enumprotocol = EnumProtocol.a(packet); EnumProtocol enumprotocol1 = (EnumProtocol) this.channel.attr(NetworkManager.c).get(); -@@ -268,7 +366,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -270,7 +368,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { try { // Paper end @@ -9882,7 +9882,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515 if (genericfuturelistener != null) { channelfuture.addListener(genericfuturelistener); -@@ -288,39 +386,83 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -290,39 +388,83 @@ public class NetworkManager extends SimpleChannelInboundHandler> { } // Paper end } else { @@ -9996,7 +9996,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515 } } -@@ -343,6 +485,8 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -345,6 +487,8 @@ public class NetworkManager extends SimpleChannelInboundHandler> { } private boolean processQueue() { if (this.packetQueue.isEmpty()) return true; @@ -10005,7 +10005,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515 // If we are on main, we are safe here in that nothing else should be processing queue off main anymore // But if we are not on main due to login/status, the parent is synchronized on packetQueue java.util.Iterator iterator = this.packetQueue.iterator(); -@@ -350,16 +494,22 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -352,16 +496,22 @@ public class NetworkManager extends SimpleChannelInboundHandler> { NetworkManager.QueuedPacket queued = iterator.next(); // poll -> peek // Fix NPE (Spigot bug caused by handleDisconnection()) @@ -10030,7 +10030,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515 } } return true; -@@ -436,10 +586,16 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -438,10 +588,16 @@ public class NetworkManager extends SimpleChannelInboundHandler> { return this.channel instanceof LocalChannel || this.channel instanceof LocalServerChannel; } @@ -11204,10 +11204,10 @@ index 6c399bcea03e839bf2f21e92b5d76d46b7088667..d3bf356ea768a32a5684eb851a2a0add } // 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 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a 100644 +index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -414,7 +414,9 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -419,7 +419,9 @@ public class PlayerConnection implements PacketListenerPlayIn { speed *= 2f; // TODO: Get the speed of the vehicle instead of the player // Paper start - Prevent moving into unloaded chunks @@ -11218,7 +11218,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity)); return; } -@@ -1053,7 +1055,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1058,7 +1060,7 @@ public class PlayerConnection implements PacketListenerPlayIn { } if (this.teleportPos != null) { @@ -11227,7 +11227,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb this.A = this.e; this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch); } -@@ -1123,7 +1125,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1128,7 +1130,7 @@ public class PlayerConnection implements PacketListenerPlayIn { speed = player.abilities.walkSpeed * 10f; } // Paper start - Prevent moving into unloaded chunks @@ -11236,7 +11236,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet()); return; } -@@ -1179,6 +1181,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1184,6 +1186,7 @@ public class PlayerConnection implements PacketListenerPlayIn { } this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9)); @@ -11244,7 +11244,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move // Paper start - prevent position desync if (this.teleportPos != null) { -@@ -1203,7 +1206,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1208,7 +1211,7 @@ public class PlayerConnection implements PacketListenerPlayIn { } this.player.setLocation(d4, d5, d6, f, f1); diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index 83572fba4..2fd1305af 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -29,7 +29,7 @@ index ac7f390cf0a404daeb80f89326fe1e510292f817..3b9b44851c5832a3660a73449b52478c metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 6ab0a51b421dc696aec292f2db955311c9cc31e3..e21ef1bdc61b7ae98eb752130a4d125c78c652d9 100644 +index 26db8a5d92d494e5f6ba9498d5a1aa555642a92b..5e24ddc7dce6f6ed45267df3217177583bdd9eb0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -118,6 +118,11 @@ public class PaperConfig { diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch index c053b2785..1f6f1038c 100644 --- a/patches/server/0009-AFK-API.patch +++ b/patches/server/0009-AFK-API.patch @@ -25,10 +25,10 @@ index caaa01b20e5b7430b809477022f8ab35f3c5bf20..335cb9c4a98ea9922ac5bdf9ee51a9f2 super(EntityTypes.PLAYER, world); this.bL = ItemStack.b; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 27c368bf19292e1076e1990a1d733eeac33ec0f4..694159cca7f98d2680133321f38d5dce859cc1b3 100644 +index 2c276971d47e48b39afa176994eba5747a3a3951..08a3875d7a6b8a003ba133a835dcdd75849383ae 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1891,8 +1891,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1893,8 +1893,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void resetIdleTimer() { this.ca = SystemUtils.getMonotonicMillis(); @@ -149,10 +149,10 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33 // Paper start public static final Predicate affectsSpawning = (entity) -> { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a..347675d6dbf3bffeda45babb584fb2a11778fa44 100644 +index dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b..3a1016e345282eab9408c9caa294e7b7e01482f9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -245,6 +245,12 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -250,6 +250,12 @@ public class PlayerConnection implements PacketListenerPlayIn { } if (this.player.F() > 0L && this.minecraftServer.getIdleTimeout() > 0 && SystemUtils.getMonotonicMillis() - this.player.F() > (long) (this.minecraftServer.getIdleTimeout() * 1000 * 60)) { @@ -165,7 +165,7 @@ index 1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a..347675d6dbf3bffeda45babb584fb2a1 this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854 this.disconnect(new ChatMessage("multiplayer.disconnect.idling")); } -@@ -501,6 +507,8 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -506,6 +512,8 @@ public class PlayerConnection implements PacketListenerPlayIn { this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); @@ -174,7 +174,7 @@ index 1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a..347675d6dbf3bffeda45babb584fb2a1 // Skip the first time we do this if (true) { // Spigot - don't skip any move events Location oldTo = to.clone(); -@@ -1202,7 +1210,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1207,7 +1215,7 @@ public class PlayerConnection implements PacketListenerPlayIn { if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot flag1 = true; @@ -183,7 +183,7 @@ index 1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a..347675d6dbf3bffeda45babb584fb2a1 } this.player.setLocation(d4, d5, d6, f, f1); -@@ -1241,6 +1249,8 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1246,6 +1254,8 @@ public class PlayerConnection implements PacketListenerPlayIn { this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch index 1b55dd1dd..16653201b 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a11ada49a4 100644 +index 08a3875d7a6b8a003ba133a835dcdd75849383ae..5c4d9b1f4e926909439b9c290d7cc5726cb8822e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -148,6 +148,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -150,6 +150,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.canPickUpLoot = true; this.maxHealthCache = this.getMaxHealth(); this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper @@ -17,7 +17,7 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1 } // Paper start public BlockPosition getPointInFront(double inFront) { -@@ -978,6 +980,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -980,6 +982,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } @@ -30,7 +30,7 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1 @Override public boolean damageEntity(DamageSource damagesource, float f) { if (this.isInvulnerable(damagesource)) { -@@ -985,7 +993,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -987,7 +995,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } else { boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex); @@ -39,7 +39,7 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1 return false; } else { if (damagesource instanceof EntityDamageSource) { -@@ -1156,6 +1164,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1158,6 +1166,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { // CraftBukkit end } @@ -47,7 +47,7 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1 return this; } } -@@ -2299,9 +2308,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -2311,9 +2320,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public boolean isFrozen() { // Paper - protected > public @@ -67,10 +67,10 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1 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 347675d6dbf3bffeda45babb584fb2a11778fa44..b0f154080fde4ad3ce03655d3e42953accb1edd6 100644 +index 3a1016e345282eab9408c9caa294e7b7e01482f9..b59e82d8ca3132f448aba892741585406cdc023e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1651,6 +1651,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1656,6 +1656,7 @@ public class PlayerConnection implements PacketListenerPlayIn { PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer()); // Paper start PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()]; diff --git a/patches/server/0021-Alternative-Keepalive-Handling.patch b/patches/server/0021-Alternative-Keepalive-Handling.patch index bcb59fe29..0f3cab771 100644 --- a/patches/server/0021-Alternative-Keepalive-Handling.patch +++ b/patches/server/0021-Alternative-Keepalive-Handling.patch @@ -17,10 +17,10 @@ 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 b0f154080fde4ad3ce03655d3e42953accb1edd6..4debbe924dc530a363ecda070663ddd9e6c9562b 100644 +index b59e82d8ca3132f448aba892741585406cdc023e..c154c95ebba389290c7e2512e377b1c75a9c50e4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -81,6 +81,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -84,6 +84,7 @@ public class PlayerConnection implements PacketListenerPlayIn { private long lastKeepAlive = SystemUtils.getMonotonicMillis(); private void setLastPing(long lastPing) { this.lastKeepAlive = lastPing;}; private long getLastPing() { return this.lastKeepAlive;}; // Paper - OBFHELPER private boolean awaitingKeepAlive; private void setPendingPing(boolean isPending) { this.awaitingKeepAlive = isPending;}; private boolean isPendingPing() { return this.awaitingKeepAlive;}; // Paper - OBFHELPER private long h; private void setKeepAliveID(long keepAliveID) { this.h = keepAliveID;}; private long getKeepAliveID() {return this.h; }; // Paper - OBFHELPER @@ -28,7 +28,7 @@ index b0f154080fde4ad3ce03655d3e42953accb1edd6..4debbe924dc530a363ecda070663ddd9 // CraftBukkit start - multithreaded fields private volatile int chatThrottle; private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle"); -@@ -214,6 +215,21 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -218,6 +219,21 @@ public class PlayerConnection implements PacketListenerPlayIn { long currentTime = SystemUtils.getMonotonicMillis(); long elapsedTime = currentTime - this.getLastPing(); @@ -50,7 +50,7 @@ index b0f154080fde4ad3ce03655d3e42953accb1edd6..4debbe924dc530a363ecda070663ddd9 if (this.isPendingPing()) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info -@@ -2817,6 +2833,16 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2830,6 +2846,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @Override public void a(PacketPlayInKeepAlive packetplayinkeepalive) { diff --git a/patches/server/0025-Fix-vanilla-command-permission-handler.patch b/patches/server/0024-Fix-vanilla-command-permission-handler.patch similarity index 100% rename from patches/server/0025-Fix-vanilla-command-permission-handler.patch rename to patches/server/0024-Fix-vanilla-command-permission-handler.patch diff --git a/patches/server/0024-MC-4-Fix-Item-position-desync.patch b/patches/server/0024-MC-4-Fix-Item-position-desync.patch deleted file mode 100644 index e619c94b3..000000000 --- a/patches/server/0024-MC-4-Fix-Item-position-desync.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sat, 6 Jul 2019 21:12:58 -0500 -Subject: [PATCH] MC-4 Fix - Item position desync - - -diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index f322dccd834ff56b99f8796309709b5b6ac01456..5cb6bb896e8e71ee1b6b1ee3fff2fdb40cacfe76 100644 ---- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java -+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -@@ -134,6 +134,12 @@ public class EntityTrackerEntry { - double vec3d_dz = this.tracker.locZ() - 2.44140625E-4D*(this.zLoc); - boolean flag1 = (vec3d_dx * vec3d_dx + vec3d_dy * vec3d_dy + vec3d_dz * vec3d_dz) >= 7.62939453125E-6D; - // Paper end - reduce allocation of Vec3D here -+ // Purpur start - fix MC-4 -+ if (net.pl3x.purpur.PurpurConfig.fixItemPositionDesync && this.tracker instanceof EntityItem) { -+ Vec3D loc = PacketPlayOutEntity.decrypt(PacketPlayOutEntity.encrypt(tracker.locX()), PacketPlayOutEntity.encrypt(tracker.locY()), PacketPlayOutEntity.encrypt(tracker.locZ())); -+ tracker.setPosition(loc.getX(), loc.getY(), loc.getZ()); -+ } -+ // Purpur end - fix MC-4 - Packet packet1 = null; - boolean flag2 = flag1 || this.tickCounter % 60 == 0; - boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1; -diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java -index e5da2b19c1177ba7f88f0aaad9d810bb313ce67b..6d9d52e4fc2cf55b21bfcb6cb1bcc6db9fb56773 100644 ---- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java -+++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java -@@ -14,10 +14,12 @@ public class PacketPlayOutEntity implements Packet { - protected boolean h; - protected boolean i; - -+ public static long encrypt(double d) { return a(d); } // Purpur - OBFHELPER - public static long a(double d0) { - return MathHelper.d(d0 * 4096.0D); - } - -+ public static Vec3D decrypt(long x, long y, long z) { return a(x, y, z); } // Purpur - OBFHELPER - public static Vec3D a(long i, long j, long k) { - return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D); - } -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 0a14d60703073e6476020c43f8349996f381400a..ef90290d21ecebf6d7c2bfc2f2a63f65a3d429e9 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -177,4 +177,9 @@ public class PurpurConfig { - InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27); - enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); - } -+ -+ public static boolean fixItemPositionDesync = false; -+ private static void fixItemPositionDesync() { -+ fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); -+ } - } diff --git a/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch similarity index 88% rename from patches/server/0026-Logger-settings-suppressing-pointless-logs.patch rename to patches/server/0025-Logger-settings-suppressing-pointless-logs.patch index b19f46533..b74295965 100644 --- a/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch @@ -17,12 +17,12 @@ index c680319e4040be2b60795b22a5e65d6444cc67ed..eaa1063ff2bc5621e93043c4de41ca62 } // CraftBukkit end diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index ef90290d21ecebf6d7c2bfc2f2a63f65a3d429e9..3d0aebd0bf1bd570f19ee296cca9f5eb8e693af1 100644 +index 0a14d60703073e6476020c43f8349996f381400a..55f174c1160420f084adaf70fbe4270ad96e6c38 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -182,4 +182,11 @@ public class PurpurConfig { - private static void fixItemPositionDesync() { - fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); +@@ -177,4 +177,11 @@ public class PurpurConfig { + InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27); + enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); } + + public static boolean loggerSuppressInitLegacyMaterialError = false; diff --git a/patches/server/0027-Disable-outdated-build-check.patch b/patches/server/0026-Disable-outdated-build-check.patch similarity index 100% rename from patches/server/0027-Disable-outdated-build-check.patch rename to patches/server/0026-Disable-outdated-build-check.patch diff --git a/patches/server/0028-Giants-AI-settings.patch b/patches/server/0027-Giants-AI-settings.patch similarity index 100% rename from patches/server/0028-Giants-AI-settings.patch rename to patches/server/0027-Giants-AI-settings.patch diff --git a/patches/server/0029-Illusioners-AI-settings.patch b/patches/server/0028-Illusioners-AI-settings.patch similarity index 100% rename from patches/server/0029-Illusioners-AI-settings.patch rename to patches/server/0028-Illusioners-AI-settings.patch diff --git a/patches/server/0030-Zombie-horse-naturally-spawn.patch b/patches/server/0029-Zombie-horse-naturally-spawn.patch similarity index 100% rename from patches/server/0030-Zombie-horse-naturally-spawn.patch rename to patches/server/0029-Zombie-horse-naturally-spawn.patch diff --git a/patches/server/0031-Charged-creeper-naturally-spawn.patch b/patches/server/0030-Charged-creeper-naturally-spawn.patch similarity index 100% rename from patches/server/0031-Charged-creeper-naturally-spawn.patch rename to patches/server/0030-Charged-creeper-naturally-spawn.patch diff --git a/patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch similarity index 100% rename from patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch rename to patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch diff --git a/patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0034-Make-Iron-Golems-Swim.patch b/patches/server/0033-Make-Iron-Golems-Swim.patch similarity index 100% rename from patches/server/0034-Make-Iron-Golems-Swim.patch rename to patches/server/0033-Make-Iron-Golems-Swim.patch diff --git a/patches/server/0035-Dont-send-useless-entity-packets.patch b/patches/server/0034-Dont-send-useless-entity-packets.patch similarity index 85% rename from patches/server/0035-Dont-send-useless-entity-packets.patch rename to patches/server/0034-Dont-send-useless-entity-packets.patch index 30da80578..ba19dbe03 100644 --- a/patches/server/0035-Dont-send-useless-entity-packets.patch +++ b/patches/server/0034-Dont-send-useless-entity-packets.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Dont send useless entity packets diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 5cb6bb896e8e71ee1b6b1ee3fff2fdb40cacfe76..aea72b0db10eed151db18490c02f291c3cded92a 100644 +index f322dccd834ff56b99f8796309709b5b6ac01456..228236bce14bfdf930570b453862dcfaae9e4823 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -@@ -178,6 +178,7 @@ public class EntityTrackerEntry { +@@ -172,6 +172,7 @@ public class EntityTrackerEntry { this.o = 0; packet1 = new PacketPlayOutEntityTeleport(this.tracker); } @@ -16,7 +16,7 @@ index 5cb6bb896e8e71ee1b6b1ee3fff2fdb40cacfe76..aea72b0db10eed151db18490c02f291c } if ((this.e || this.tracker.impulse || this.tracker instanceof EntityLiving && ((EntityLiving) this.tracker).isGliding()) && this.tickCounter > 0) { -@@ -264,6 +265,22 @@ public class EntityTrackerEntry { +@@ -258,6 +259,22 @@ public class EntityTrackerEntry { } @@ -40,7 +40,7 @@ index 5cb6bb896e8e71ee1b6b1ee3fff2fdb40cacfe76..aea72b0db10eed151db18490c02f291c this.tracker.c(entityplayer); entityplayer.c(this.tracker); diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java -index 6d9d52e4fc2cf55b21bfcb6cb1bcc6db9fb56773..0010448e3aaafc53d0f8d60f36983cb381e7afc9 100644 +index 8e48407fd405ac4c3eece7762b8155c5d0f00fa0..91c4e658230bb8bbce9d0f56db0768a7c09f0095 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java @@ -5,11 +5,11 @@ import java.io.IOException; @@ -61,7 +61,7 @@ index 6d9d52e4fc2cf55b21bfcb6cb1bcc6db9fb56773..0010448e3aaafc53d0f8d60f36983cb3 protected boolean h; protected boolean i; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 3d0aebd0bf1bd570f19ee296cca9f5eb8e693af1..6a622c7166dcedc7454ed2183e946a14c712104d 100644 +index 55f174c1160420f084adaf70fbe4270ad96e6c38..01dbf8e8e5dc1d42414f0b7229a95b2255243154 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -178,6 +178,11 @@ public class PurpurConfig { @@ -73,6 +73,6 @@ index 3d0aebd0bf1bd570f19ee296cca9f5eb8e693af1..6a622c7166dcedc7454ed2183e946a14 + dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets); + } + - public static boolean fixItemPositionDesync = false; - private static void fixItemPositionDesync() { - fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); + public static boolean loggerSuppressInitLegacyMaterialError = false; + public static boolean loggerSuppressIgnoredAdvancementWarnings = false; + private static void loggerSettings() { diff --git a/patches/server/0036-Tulips-change-fox-type.patch b/patches/server/0035-Tulips-change-fox-type.patch similarity index 100% rename from patches/server/0036-Tulips-change-fox-type.patch rename to patches/server/0035-Tulips-change-fox-type.patch diff --git a/patches/server/0037-Breedable-Polar-Bears.patch b/patches/server/0036-Breedable-Polar-Bears.patch similarity index 100% rename from patches/server/0037-Breedable-Polar-Bears.patch rename to patches/server/0036-Breedable-Polar-Bears.patch diff --git a/patches/server/0038-Chickens-can-retaliate.patch b/patches/server/0037-Chickens-can-retaliate.patch similarity index 100% rename from patches/server/0038-Chickens-can-retaliate.patch rename to patches/server/0037-Chickens-can-retaliate.patch diff --git a/patches/server/0039-Add-option-to-set-armorstand-step-height.patch b/patches/server/0038-Add-option-to-set-armorstand-step-height.patch similarity index 100% rename from patches/server/0039-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0038-Add-option-to-set-armorstand-step-height.patch diff --git a/patches/server/0040-Cat-spawning-options.patch b/patches/server/0039-Cat-spawning-options.patch similarity index 100% rename from patches/server/0040-Cat-spawning-options.patch rename to patches/server/0039-Cat-spawning-options.patch diff --git a/patches/server/0041-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0040-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch similarity index 100% rename from patches/server/0041-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch rename to patches/server/0040-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch diff --git a/patches/server/0042-Cows-eat-mushrooms.patch b/patches/server/0041-Cows-eat-mushrooms.patch similarity index 100% rename from patches/server/0042-Cows-eat-mushrooms.patch rename to patches/server/0041-Cows-eat-mushrooms.patch diff --git a/patches/server/0043-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0042-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0043-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0042-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0044-Pigs-give-saddle-back.patch b/patches/server/0043-Pigs-give-saddle-back.patch similarity index 100% rename from patches/server/0044-Pigs-give-saddle-back.patch rename to patches/server/0043-Pigs-give-saddle-back.patch diff --git a/patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0044-Snowman-drop-and-put-back-pumpkin.patch similarity index 100% rename from patches/server/0045-Snowman-drop-and-put-back-pumpkin.patch rename to patches/server/0044-Snowman-drop-and-put-back-pumpkin.patch diff --git a/patches/server/0046-Ender-dragon-always-drop-egg.patch b/patches/server/0045-Ender-dragon-always-drop-egg.patch similarity index 100% rename from patches/server/0046-Ender-dragon-always-drop-egg.patch rename to patches/server/0045-Ender-dragon-always-drop-egg.patch diff --git a/patches/server/0047-Ender-dragon-always-drop-full-exp.patch b/patches/server/0046-Ender-dragon-always-drop-full-exp.patch similarity index 100% rename from patches/server/0047-Ender-dragon-always-drop-full-exp.patch rename to patches/server/0046-Ender-dragon-always-drop-full-exp.patch diff --git a/patches/server/0048-Signs-editable-on-right-click.patch b/patches/server/0047-Signs-editable-on-right-click.patch similarity index 100% rename from patches/server/0048-Signs-editable-on-right-click.patch rename to patches/server/0047-Signs-editable-on-right-click.patch diff --git a/patches/server/0049-Signs-allow-color-codes.patch b/patches/server/0048-Signs-allow-color-codes.patch similarity index 92% rename from patches/server/0049-Signs-allow-color-codes.patch rename to patches/server/0048-Signs-allow-color-codes.patch index 52b693cbe..32ceef601 100644 --- a/patches/server/0049-Signs-allow-color-codes.patch +++ b/patches/server/0048-Signs-allow-color-codes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index ddef5d06f46ecb4178928b8ca751d9a11ada49a4..a2924ab6185183adccd78faf3eec02ee71e45795 100644 +index 5c4d9b1f4e926909439b9c290d7cc5726cb8822e..32d1ca467fd80de220c5bdefd23c1f84d3c80917 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1416,6 +1416,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1418,6 +1418,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void openSign(TileEntitySign tileentitysign) { @@ -17,10 +17,10 @@ index ddef5d06f46ecb4178928b8ca751d9a11ada49a4..a2924ab6185183adccd78faf3eec02ee 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 4debbe924dc530a363ecda070663ddd9e6c9562b..7676659f44b84797aea0ffb4fc0ce6d934739e7b 100644 +index c154c95ebba389290c7e2512e377b1c75a9c50e4..e2cbffd113c3b49522786df62b4285fe6763434e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2814,6 +2814,14 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2827,6 +2827,14 @@ public class PlayerConnection implements PacketListenerPlayIn { } } // Paper end diff --git a/patches/server/0050-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0049-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 100% rename from patches/server/0050-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0049-Allow-soil-to-moisten-from-water-directly-under-it.patch diff --git a/patches/server/0051-Controllable-Minecarts.patch b/patches/server/0050-Controllable-Minecarts.patch similarity index 98% rename from patches/server/0051-Controllable-Minecarts.patch rename to patches/server/0050-Controllable-Minecarts.patch index 0930e73c6..12b1ca639 100644 --- a/patches/server/0051-Controllable-Minecarts.patch +++ b/patches/server/0050-Controllable-Minecarts.patch @@ -106,10 +106,10 @@ index efe5c0cecaf12ef921f6d32ff6670eff051bf323..a814cf280d1ce0d446d24da8e596f13e this.move(EnumMoveType.SELF, this.getMot()); if (!this.onGround) { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a2924ab6185183adccd78faf3eec02ee71e45795..a295968ed35295d7247f7da37f8d9f56a7db6961 100644 +index 32d1ca467fd80de220c5bdefd23c1f84d3c80917..73bf1c5fa7aa700786c49905401b0e5d59c90d39 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -991,6 +991,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -993,6 +993,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { if (this.isInvulnerable(damagesource)) { return false; } else { diff --git a/patches/server/0052-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch similarity index 100% rename from patches/server/0052-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch diff --git a/patches/server/0053-Players-should-not-cram-to-death.patch b/patches/server/0052-Players-should-not-cram-to-death.patch similarity index 85% rename from patches/server/0053-Players-should-not-cram-to-death.patch rename to patches/server/0052-Players-should-not-cram-to-death.patch index e07168d12..265340e7f 100644 --- a/patches/server/0053-Players-should-not-cram-to-death.patch +++ b/patches/server/0052-Players-should-not-cram-to-death.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a295968ed35295d7247f7da37f8d9f56a7db6961..36168d0f7c730c636564808f4deb7cef42c35b64 100644 +index 73bf1c5fa7aa700786c49905401b0e5d59c90d39..4caca2cb5ce981aa555ceb7464fedc9e32779d88 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1393,7 +1393,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1395,7 +1395,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public boolean isInvulnerable(DamageSource damagesource) { diff --git a/patches/server/0054-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0053-Option-to-toggle-milk-curing-bad-omen.patch similarity index 100% rename from patches/server/0054-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0053-Option-to-toggle-milk-curing-bad-omen.patch diff --git a/patches/server/0055-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0054-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0055-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0054-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0056-Debug-stick-should-not-update-neighbors.patch b/patches/server/0055-Debug-stick-should-not-update-neighbors.patch similarity index 100% rename from patches/server/0056-Debug-stick-should-not-update-neighbors.patch rename to patches/server/0055-Debug-stick-should-not-update-neighbors.patch diff --git a/patches/server/0057-Fix-the-dead-lagging-the-server.patch b/patches/server/0056-Fix-the-dead-lagging-the-server.patch similarity index 100% rename from patches/server/0057-Fix-the-dead-lagging-the-server.patch rename to patches/server/0056-Fix-the-dead-lagging-the-server.patch diff --git a/patches/server/0058-Skip-events-if-there-s-no-listeners.patch b/patches/server/0057-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0058-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0057-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0059-Add-permission-for-F3-N-debug.patch b/patches/server/0058-Add-permission-for-F3-N-debug.patch similarity index 100% rename from patches/server/0059-Add-permission-for-F3-N-debug.patch rename to patches/server/0058-Add-permission-for-F3-N-debug.patch diff --git a/patches/server/0060-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0059-Add-wither-skeleton-takes-wither-damage-option.patch similarity index 100% rename from patches/server/0060-Add-wither-skeleton-takes-wither-damage-option.patch rename to patches/server/0059-Add-wither-skeleton-takes-wither-damage-option.patch diff --git a/patches/server/0061-Configurable-TPS-Catchup.patch b/patches/server/0060-Configurable-TPS-Catchup.patch similarity index 93% rename from patches/server/0061-Configurable-TPS-Catchup.patch rename to patches/server/0060-Configurable-TPS-Catchup.patch index 303077c68..c25515c43 100644 --- a/patches/server/0061-Configurable-TPS-Catchup.patch +++ b/patches/server/0060-Configurable-TPS-Catchup.patch @@ -24,10 +24,10 @@ index fe3b76e4ed11f0183731a0dcc39a323ccee3fd2e..2d01bc9c5f95e7bd950a8c9137d1a1ab this.methodProfiler.exit(); this.methodProfiler.b(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 6a622c7166dcedc7454ed2183e946a14c712104d..c71fc3e4bbe2b56ae50700bb2e41192690e59da8 100644 +index 01dbf8e8e5dc1d42414f0b7229a95b2255243154..c627368c1dbfb526ff6c913130f908c67a794d1c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -194,4 +194,9 @@ public class PurpurConfig { +@@ -189,4 +189,9 @@ public class PurpurConfig { loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError); loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings); } diff --git a/patches/server/0062-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0061-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch similarity index 100% rename from patches/server/0062-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch rename to patches/server/0061-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch diff --git a/patches/server/0063-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0062-Add-enderman-and-creeper-griefing-controls.patch similarity index 100% rename from patches/server/0063-Add-enderman-and-creeper-griefing-controls.patch rename to patches/server/0062-Add-enderman-and-creeper-griefing-controls.patch diff --git a/patches/server/0064-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0063-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch similarity index 100% rename from patches/server/0064-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch rename to patches/server/0063-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch diff --git a/patches/server/0065-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0064-Villagers-farming-can-bypass-mob-griefing-gamerule.patch similarity index 100% rename from patches/server/0065-Villagers-farming-can-bypass-mob-griefing-gamerule.patch rename to patches/server/0064-Villagers-farming-can-bypass-mob-griefing-gamerule.patch diff --git a/patches/server/0066-Villagers-follow-emerald-blocks.patch b/patches/server/0065-Villagers-follow-emerald-blocks.patch similarity index 100% rename from patches/server/0066-Villagers-follow-emerald-blocks.patch rename to patches/server/0065-Villagers-follow-emerald-blocks.patch diff --git a/patches/server/0067-Allow-leashing-villagers.patch b/patches/server/0066-Allow-leashing-villagers.patch similarity index 100% rename from patches/server/0067-Allow-leashing-villagers.patch rename to patches/server/0066-Allow-leashing-villagers.patch diff --git a/patches/server/0068-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0067-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0068-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0067-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0069-Implement-infinite-lava.patch b/patches/server/0068-Implement-infinite-lava.patch similarity index 100% rename from patches/server/0069-Implement-infinite-lava.patch rename to patches/server/0068-Implement-infinite-lava.patch diff --git a/patches/server/0070-Make-lava-flow-speed-configurable.patch b/patches/server/0069-Make-lava-flow-speed-configurable.patch similarity index 100% rename from patches/server/0070-Make-lava-flow-speed-configurable.patch rename to patches/server/0069-Make-lava-flow-speed-configurable.patch diff --git a/patches/server/0071-Add-player-death-exp-control-options.patch b/patches/server/0070-Add-player-death-exp-control-options.patch similarity index 100% rename from patches/server/0071-Add-player-death-exp-control-options.patch rename to patches/server/0070-Add-player-death-exp-control-options.patch diff --git a/patches/server/0072-PaperPR-Projectile-load-save-limit-per-chunk.patch b/patches/server/0071-PaperPR-Projectile-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0072-PaperPR-Projectile-load-save-limit-per-chunk.patch rename to patches/server/0071-PaperPR-Projectile-load-save-limit-per-chunk.patch diff --git a/patches/server/0073-Add-canSaveToDisk-to-Entity.patch b/patches/server/0072-Add-canSaveToDisk-to-Entity.patch similarity index 100% rename from patches/server/0073-Add-canSaveToDisk-to-Entity.patch rename to patches/server/0072-Add-canSaveToDisk-to-Entity.patch diff --git a/patches/server/0074-Configurable-void-damage-height.patch b/patches/server/0073-Configurable-void-damage-height.patch similarity index 100% rename from patches/server/0074-Configurable-void-damage-height.patch rename to patches/server/0073-Configurable-void-damage-height.patch diff --git a/patches/server/0075-Dispenser-curse-of-binding-protection.patch b/patches/server/0074-Dispenser-curse-of-binding-protection.patch similarity index 100% rename from patches/server/0075-Dispenser-curse-of-binding-protection.patch rename to patches/server/0074-Dispenser-curse-of-binding-protection.patch diff --git a/patches/server/0076-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0075-Add-option-for-boats-to-eject-players-on-land.patch similarity index 100% rename from patches/server/0076-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0075-Add-option-for-boats-to-eject-players-on-land.patch diff --git a/patches/server/0077-Add-obfhelpers-for-plugin-use.patch b/patches/server/0076-Add-obfhelpers-for-plugin-use.patch similarity index 100% rename from patches/server/0077-Add-obfhelpers-for-plugin-use.patch rename to patches/server/0076-Add-obfhelpers-for-plugin-use.patch diff --git a/patches/server/0078-Mending-mends-most-damages-equipment-first.patch b/patches/server/0077-Mending-mends-most-damages-equipment-first.patch similarity index 100% rename from patches/server/0078-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0077-Mending-mends-most-damages-equipment-first.patch diff --git a/patches/server/0079-Implement-bamboo-growth-settings.patch b/patches/server/0078-Implement-bamboo-growth-settings.patch similarity index 100% rename from patches/server/0079-Implement-bamboo-growth-settings.patch rename to patches/server/0078-Implement-bamboo-growth-settings.patch diff --git a/patches/server/0080-Add-5-second-tps-average-in-tps.patch b/patches/server/0079-Add-5-second-tps-average-in-tps.patch similarity index 100% rename from patches/server/0080-Add-5-second-tps-average-in-tps.patch rename to patches/server/0079-Add-5-second-tps-average-in-tps.patch diff --git a/patches/server/0081-Implement-elytra-settings.patch b/patches/server/0080-Implement-elytra-settings.patch similarity index 100% rename from patches/server/0081-Implement-elytra-settings.patch rename to patches/server/0080-Implement-elytra-settings.patch diff --git a/patches/server/0082-Item-entity-immunities.patch b/patches/server/0081-Item-entity-immunities.patch similarity index 95% rename from patches/server/0082-Item-entity-immunities.patch rename to patches/server/0081-Item-entity-immunities.patch index 03c196c9d..6df6dca08 100644 --- a/patches/server/0082-Item-entity-immunities.patch +++ b/patches/server/0081-Item-entity-immunities.patch @@ -17,7 +17,7 @@ index ea1bccdc776c6eddbad1407cdc31a889875c8909..c2692d6d667d6404a044f1ad1c24e612 return this.O == tag; } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index ba73d14437cfdf07ef0f1f6266131c113c2741fd..f55d40c981c75decfd7951669d541bae2fbce7b3 100644 +index f41aaa7623c052b9f4044898d1bdee898c03057a..1ab024c19761d97d0ac81edcc3fb1d9be8c40b5f 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -23,6 +23,8 @@ public class EntityItem extends Entity { @@ -51,10 +51,10 @@ index ba73d14437cfdf07ef0f1f6266131c113c2741fd..f55d40c981c75decfd7951669d541bae } @Override -@@ -523,4 +533,15 @@ public class EntityItem extends Entity { - public Packet P() { - return new PacketPlayOutSpawnEntity(this); +@@ -535,4 +545,15 @@ public class EntityItem extends Entity { + super.setPositionRaw(x, y, z); } + // Paper end - fix MC-4 + + // Purpur start + public void respawnOnClient() { @@ -68,7 +68,7 @@ index ba73d14437cfdf07ef0f1f6266131c113c2741fd..f55d40c981c75decfd7951669d541bae + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index aea72b0db10eed151db18490c02f291c3cded92a..29731da08d57f26b4173fef3f6fd37b36deb892e 100644 +index 228236bce14bfdf930570b453862dcfaae9e4823..ad06bd81eded5d60f16c2d0ad1a4390f4b5a11a5 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -106,6 +106,15 @@ public class EntityTrackerEntry { diff --git a/patches/server/0083-Add-ping-command.patch b/patches/server/0082-Add-ping-command.patch similarity index 98% rename from patches/server/0083-Add-ping-command.patch rename to patches/server/0082-Add-ping-command.patch index a2ad9c322..5f17cd594 100644 --- a/patches/server/0083-Add-ping-command.patch +++ b/patches/server/0082-Add-ping-command.patch @@ -67,7 +67,7 @@ index 86f1cfe454ea0a989775b49a6b88375c766ef647..da53af61d1171db3c167c6e007adf953 if (!(this.k instanceof EntityPlayer)) { throw CommandListenerWrapper.a.create(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c71fc3e4bbe2b56ae50700bb2e41192690e59da8..f137d2a2800fb82420c95b17bb7a93ea9bbc414d 100644 +index c627368c1dbfb526ff6c913130f908c67a794d1c..57bba3c0f8352a7137e54a3a279cb5e02dc8463a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -133,10 +133,12 @@ public class PurpurConfig { diff --git a/patches/server/0084-Configurable-jockey-options.patch b/patches/server/0083-Configurable-jockey-options.patch similarity index 100% rename from patches/server/0084-Configurable-jockey-options.patch rename to patches/server/0083-Configurable-jockey-options.patch diff --git a/patches/server/0085-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0084-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 100% rename from patches/server/0085-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0084-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch diff --git a/patches/server/0086-Add-phantom-spawning-options.patch b/patches/server/0085-Add-phantom-spawning-options.patch similarity index 100% rename from patches/server/0086-Add-phantom-spawning-options.patch rename to patches/server/0085-Add-phantom-spawning-options.patch diff --git a/patches/server/0087-Implement-bed-explosion-options.patch b/patches/server/0086-Implement-bed-explosion-options.patch similarity index 100% rename from patches/server/0087-Implement-bed-explosion-options.patch rename to patches/server/0086-Implement-bed-explosion-options.patch diff --git a/patches/server/0088-Implement-respawn-anchor-explosion-options.patch b/patches/server/0087-Implement-respawn-anchor-explosion-options.patch similarity index 100% rename from patches/server/0088-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0087-Implement-respawn-anchor-explosion-options.patch diff --git a/patches/server/0089-Add-allow-water-in-end-world-option.patch b/patches/server/0088-Add-allow-water-in-end-world-option.patch similarity index 94% rename from patches/server/0089-Add-allow-water-in-end-world-option.patch rename to patches/server/0088-Add-allow-water-in-end-world-option.patch index b62f28844..9ad24950c 100644 --- a/patches/server/0089-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0088-Add-allow-water-in-end-world-option.patch @@ -68,7 +68,7 @@ index a8571dae8daefb557a8e3ee39c80ebc3b1b5aad9..7a82a894bb3f737cc80f0b4b8d7a1b25 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index f137d2a2800fb82420c95b17bb7a93ea9bbc414d..35e54a7dfe88e33cb3e693194d300289469d3307 100644 +index 57bba3c0f8352a7137e54a3a279cb5e02dc8463a..f1e17dabe91a539332080ebb96a54833011441f2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,7 +1,6 @@ @@ -79,15 +79,15 @@ index f137d2a2800fb82420c95b17bb7a93ea9bbc414d..35e54a7dfe88e33cb3e693194d300289 import net.minecraft.server.MinecraftServer; import net.pl3x.purpur.command.PurpurCommand; import org.bukkit.Bukkit; -@@ -189,6 +188,11 @@ public class PurpurConfig { - private static void fixItemPositionDesync() { - fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); +@@ -185,6 +184,11 @@ public class PurpurConfig { + dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets); } -+ + + public static boolean allowWaterPlacementInTheEnd = true; + private static void allowWaterPlacementInEnd() { + allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd); + } - ++ public static boolean loggerSuppressInitLegacyMaterialError = false; public static boolean loggerSuppressIgnoredAdvancementWarnings = false; + private static void loggerSettings() { diff --git a/patches/server/0090-Allow-color-codes-in-books.patch b/patches/server/0089-Allow-color-codes-in-books.patch similarity index 90% rename from patches/server/0090-Allow-color-codes-in-books.patch rename to patches/server/0089-Allow-color-codes-in-books.patch index e3180ad39..4e4e02c26 100644 --- a/patches/server/0090-Allow-color-codes-in-books.patch +++ b/patches/server/0089-Allow-color-codes-in-books.patch @@ -5,10 +5,10 @@ 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 7676659f44b84797aea0ffb4fc0ce6d934739e7b..bd206f1810283b409ea69cbfe471eadbef4b8ec2 100644 +index e2cbffd113c3b49522786df62b4285fe6763434e..7dab659663f0b9e115e3eee98ef71c072f52f061 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1003,7 +1003,8 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1008,7 +1008,8 @@ public class PlayerConnection implements PacketListenerPlayIn { if (itemstack.getItem() == Items.WRITABLE_BOOK) { NBTTagList nbttaglist = new NBTTagList(); @@ -18,7 +18,7 @@ index 7676659f44b84797aea0ffb4fc0ce6d934739e7b..bd206f1810283b409ea69cbfe471eadb ItemStack old = itemstack.cloneItemStack(); // CraftBukkit itemstack.a("pages", (NBTBase) nbttaglist); CraftEventFactory.handleEditBookEvent(player, i, old, itemstack); // CraftBukkit -@@ -1021,13 +1022,14 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1026,13 +1027,14 @@ public class PlayerConnection implements PacketListenerPlayIn { itemstack1.setTag(nbttagcompound.clone()); } @@ -35,7 +35,7 @@ index 7676659f44b84797aea0ffb4fc0ce6d934739e7b..bd206f1810283b409ea69cbfe471eadb ChatComponentText chatcomponenttext = new ChatComponentText(s1); String s2 = IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) chatcomponenttext); -@@ -1039,6 +1041,16 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1044,6 +1046,16 @@ public class PlayerConnection implements PacketListenerPlayIn { } } diff --git a/patches/server/0091-Entity-lifespan.patch b/patches/server/0090-Entity-lifespan.patch similarity index 97% rename from patches/server/0091-Entity-lifespan.patch rename to patches/server/0090-Entity-lifespan.patch index 01d4cda9c..4f695b572 100644 --- a/patches/server/0091-Entity-lifespan.patch +++ b/patches/server/0090-Entity-lifespan.patch @@ -92,10 +92,10 @@ index 7a40f0864677e54c3a0eca6dcb9a115864edfbbd..1d5d87e61946c674f61541455cf54018 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index bd206f1810283b409ea69cbfe471eadbef4b8ec2..a57588acf06802fbcf086dd1533bf9619d49e22f 100644 +index 7dab659663f0b9e115e3eee98ef71c072f52f061..54b77cab50fedb529998cb972cbe68b6f94f1dc4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2214,6 +2214,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2219,6 +2219,7 @@ public class PlayerConnection implements PacketListenerPlayIn { boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient; Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem(); PlayerInteractEntityEvent event; diff --git a/patches/server/0092-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0091-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 95% rename from patches/server/0092-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0091-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index ef27104d5..943042e9a 100644 --- a/patches/server/0092-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0091-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -17,10 +17,10 @@ index 4ffad61ce7ec81e9e329c117c9d122c51dbb4f69..6046b4788ba8f170e6f5fa021750936f } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 36168d0f7c730c636564808f4deb7cef42c35b64..69be072e7664dd8d54ad98300bdfbba3351dbeab 100644 +index 4caca2cb5ce981aa555ceb7464fedc9e32779d88..0d4ab4e8eda4059fbafe7645c9627ab5566edd85 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -2366,4 +2366,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -2378,4 +2378,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return (CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end diff --git a/patches/server/0093-Squid-EAR-immunity.patch b/patches/server/0092-Squid-EAR-immunity.patch similarity index 100% rename from patches/server/0093-Squid-EAR-immunity.patch rename to patches/server/0092-Squid-EAR-immunity.patch diff --git a/patches/server/0094-Configurable-end-spike-seed.patch b/patches/server/0093-Configurable-end-spike-seed.patch similarity index 96% rename from patches/server/0094-Configurable-end-spike-seed.patch rename to patches/server/0093-Configurable-end-spike-seed.patch index d83bc0563..eb2ccd484 100644 --- a/patches/server/0094-Configurable-end-spike-seed.patch +++ b/patches/server/0093-Configurable-end-spike-seed.patch @@ -25,7 +25,7 @@ index 00a1707209b21fc0163960c957864f798da15554..5eb9b3d35e12c2d3dc5f158cbed0b0a0 List list = worldgenfeatureendspikeconfiguration.c(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 35e54a7dfe88e33cb3e693194d300289469d3307..5405928a681d4de0b47952c9c917e0037093df8c 100644 +index f1e17dabe91a539332080ebb96a54833011441f2..bd6e173fe9daae2db5bec5fd8085565d702a3dff 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0095-Configurable-dungeon-seed.patch b/patches/server/0094-Configurable-dungeon-seed.patch similarity index 96% rename from patches/server/0095-Configurable-dungeon-seed.patch rename to patches/server/0094-Configurable-dungeon-seed.patch index a13204785..97d5aa0a1 100644 --- a/patches/server/0095-Configurable-dungeon-seed.patch +++ b/patches/server/0094-Configurable-dungeon-seed.patch @@ -31,7 +31,7 @@ index 07f7b69fefe66ec4f26ca7b4fb3b752e80aeed07..6aa1626f38df0cd8ae8a417dc4fca213 int i = random.nextInt(2) + 2; int j = -i - 1; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 5405928a681d4de0b47952c9c917e0037093df8c..37f666251e2a8cc84484a70ed64c2725cc3e7eb3 100644 +index bd6e173fe9daae2db5bec5fd8085565d702a3dff..b3f21efe94bd2765919c069ba49667f23780cd7f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -141,10 +141,13 @@ public class PurpurConfig { diff --git a/patches/server/0096-Phantoms-burn-in-light.patch b/patches/server/0095-Phantoms-burn-in-light.patch similarity index 100% rename from patches/server/0096-Phantoms-burn-in-light.patch rename to patches/server/0095-Phantoms-burn-in-light.patch diff --git a/patches/server/0097-Configurable-villager-breeding.patch b/patches/server/0096-Configurable-villager-breeding.patch similarity index 100% rename from patches/server/0097-Configurable-villager-breeding.patch rename to patches/server/0096-Configurable-villager-breeding.patch diff --git a/patches/server/0098-Redstone-deactivates-spawners.patch b/patches/server/0097-Redstone-deactivates-spawners.patch similarity index 100% rename from patches/server/0098-Redstone-deactivates-spawners.patch rename to patches/server/0097-Redstone-deactivates-spawners.patch diff --git a/patches/server/0099-Totems-work-in-inventory.patch b/patches/server/0098-Totems-work-in-inventory.patch similarity index 100% rename from patches/server/0099-Totems-work-in-inventory.patch rename to patches/server/0098-Totems-work-in-inventory.patch diff --git a/patches/server/0100-Fix-death-message-colors.patch b/patches/server/0099-Fix-death-message-colors.patch similarity index 92% rename from patches/server/0100-Fix-death-message-colors.patch rename to patches/server/0099-Fix-death-message-colors.patch index 99901a7a1..21575154b 100644 --- a/patches/server/0100-Fix-death-message-colors.patch +++ b/patches/server/0099-Fix-death-message-colors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix death message colors diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 69be072e7664dd8d54ad98300bdfbba3351dbeab..05f9a8185489434d274301ba0a62213a5ea0ef3f 100644 +index 0d4ab4e8eda4059fbafe7645c9627ab5566edd85..933d90e7026adc44e95a7c4083d6f9174ffb1f6c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -839,7 +839,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -841,7 +841,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting { IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage(); diff --git a/patches/server/0101-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch b/patches/server/0100-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch similarity index 93% rename from patches/server/0101-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch rename to patches/server/0100-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch index e567e3acd..e660dec51 100644 --- a/patches/server/0101-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch +++ b/patches/server/0100-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a57588acf06802fbcf086dd1533bf9619d49e22f..261dbea122b092afb413e034f2cefec8002941c7 100644 +index 54b77cab50fedb529998cb972cbe68b6f94f1dc4..68a2bf3112786a6c9fb8cd5a0c82d8730ecfb15a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1973,7 +1973,15 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1978,7 +1978,15 @@ public class PlayerConnection implements PacketListenerPlayIn { return null; } @@ -26,7 +26,7 @@ index a57588acf06802fbcf086dd1533bf9619d49e22f..261dbea122b092afb413e034f2cefec8 PlayerConnection.this.minecraftServer.console.sendMessage(message); if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) { for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) { -@@ -2006,7 +2014,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2011,7 +2019,7 @@ public class PlayerConnection implements PacketListenerPlayIn { // Paper Start - (Meh) Support for vanilla world scoreboard name coloring String displayName = event.getPlayer().getDisplayName(); if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) { diff --git a/patches/server/0102-Populator-seed-controls.patch b/patches/server/0101-Populator-seed-controls.patch similarity index 100% rename from patches/server/0102-Populator-seed-controls.patch rename to patches/server/0101-Populator-seed-controls.patch diff --git a/patches/server/0103-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0102-Add-vindicator-johnny-spawn-chance.patch similarity index 100% rename from patches/server/0103-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0102-Add-vindicator-johnny-spawn-chance.patch diff --git a/patches/server/0104-DragonEggPlaceEvent.patch b/patches/server/0103-DragonEggPlaceEvent.patch similarity index 100% rename from patches/server/0104-DragonEggPlaceEvent.patch rename to patches/server/0103-DragonEggPlaceEvent.patch diff --git a/patches/server/0105-Add-option-to-disable-mushroom-block-updates.patch b/patches/server/0104-Add-option-to-disable-mushroom-block-updates.patch similarity index 98% rename from patches/server/0105-Add-option-to-disable-mushroom-block-updates.patch rename to patches/server/0104-Add-option-to-disable-mushroom-block-updates.patch index ba792b5d8..46e50e08f 100644 --- a/patches/server/0105-Add-option-to-disable-mushroom-block-updates.patch +++ b/patches/server/0104-Add-option-to-disable-mushroom-block-updates.patch @@ -73,10 +73,10 @@ index e8f340b9f2a1e5de9cf7e8cf595de8a806cb528a..3490af6fe0cf2eccac9753778cf4085f @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 37f666251e2a8cc84484a70ed64c2725cc3e7eb3..46d99d1e7b10aa63f064e2016a5ca53a5290397a 100644 +index b3f21efe94bd2765919c069ba49667f23780cd7f..ec7bac5b7576df2e50be56471384fe6374dc9a30 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -205,6 +205,11 @@ public class PurpurConfig { +@@ -200,6 +200,11 @@ public class PurpurConfig { allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd); } diff --git a/patches/server/0106-Dispensers-place-anvils-option.patch b/patches/server/0105-Dispensers-place-anvils-option.patch similarity index 100% rename from patches/server/0106-Dispensers-place-anvils-option.patch rename to patches/server/0105-Dispensers-place-anvils-option.patch diff --git a/patches/server/0107-Allow-anvil-colors.patch b/patches/server/0106-Allow-anvil-colors.patch similarity index 100% rename from patches/server/0107-Allow-anvil-colors.patch rename to patches/server/0106-Allow-anvil-colors.patch diff --git a/patches/server/0108-Add-no-tick-block-list.patch b/patches/server/0107-Add-no-tick-block-list.patch similarity index 100% rename from patches/server/0108-Add-no-tick-block-list.patch rename to patches/server/0107-Add-no-tick-block-list.patch diff --git a/patches/server/0109-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0108-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 100% rename from patches/server/0109-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0108-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0110-Short-enderman-height.patch b/patches/server/0109-Short-enderman-height.patch similarity index 97% rename from patches/server/0110-Short-enderman-height.patch rename to patches/server/0109-Short-enderman-height.patch index d0325aca9..bba677168 100644 --- a/patches/server/0110-Short-enderman-height.patch +++ b/patches/server/0109-Short-enderman-height.patch @@ -30,7 +30,7 @@ index 37b984a5b6c1c6e146e1c4b0947d1e39a051cfbb..7a35a367a5840fd5df72b0bd64e63019 public static final EntityTypes EVOKER = a("evoker", EntityTypes.Builder.a(EntityEvoker::new, EnumCreatureType.MONSTER).a(0.6F, 1.95F).trackingRange(8)); public static final EntityTypes EVOKER_FANGS = a("evoker_fangs", EntityTypes.Builder.a(EntityEvokerFangs::new, EnumCreatureType.MISC).a(0.5F, 0.8F).trackingRange(6).updateInterval(2)); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 46d99d1e7b10aa63f064e2016a5ca53a5290397a..f75df999005e4d2bab4df82531a37fc914d84175 100644 +index ec7bac5b7576df2e50be56471384fe6374dc9a30..ef423e986d25e089d6063b17bf7b2f8d6430297b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -190,6 +190,11 @@ public class PurpurConfig { diff --git a/patches/server/0111-Stop-squids-floating-on-top-of-water.patch b/patches/server/0110-Stop-squids-floating-on-top-of-water.patch similarity index 100% rename from patches/server/0111-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0110-Stop-squids-floating-on-top-of-water.patch diff --git a/patches/server/0112-Ridables.patch b/patches/server/0111-Ridables.patch similarity index 99% rename from patches/server/0112-Ridables.patch rename to patches/server/0111-Ridables.patch index 44c1c99dc..1327aafe8 100644 --- a/patches/server/0112-Ridables.patch +++ b/patches/server/0111-Ridables.patch @@ -3211,10 +3211,10 @@ index a3a428da99574c485fcf2b8c7944e0d8354146ee..cf7de0127166f6175a6246062c8664e6 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 05f9a8185489434d274301ba0a62213a5ea0ef3f..b5f6a98fe44c30417a3b3496dc45238c99c23ebe 100644 +index 933d90e7026adc44e95a7c4083d6f9174ffb1f6c..a1abdd06478da22bd9c7ea4555afb36efde826c7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -506,6 +506,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -508,6 +508,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } this.advancementDataPlayer.b(this); @@ -4973,10 +4973,10 @@ index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cb + } +} diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 261dbea122b092afb413e034f2cefec8002941c7..f4f4127b017215ff26b406ff22db8da77c9cbf92 100644 +index 68a2bf3112786a6c9fb8cd5a0c82d8730ecfb15a..dcbed41f6dd03e3f01e9741f55c57688f36b5ced 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2231,6 +2231,8 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2236,6 +2236,8 @@ public class PlayerConnection implements PacketListenerPlayIn { } this.server.getPluginManager().callEvent(event); @@ -5053,7 +5053,7 @@ index 9d93a8c86b675cf55210724a0b695f960b009d69..bed00077205d3c2d7b2eb67db5af86dd return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index f75df999005e4d2bab4df82531a37fc914d84175..6e22d0cd05cc5f0d8d66b03b6484859aad0a387c 100644 +index ef423e986d25e089d6063b17bf7b2f8d6430297b..1a14a3f05ef42fb5161f8df2d96f4236633d641e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -134,11 +134,13 @@ public class PurpurConfig { diff --git a/patches/server/0113-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0112-Use-configured-height-for-nether-surface-builders.patch similarity index 100% rename from patches/server/0113-Use-configured-height-for-nether-surface-builders.patch rename to patches/server/0112-Use-configured-height-for-nether-surface-builders.patch diff --git a/patches/server/0114-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0113-Crying-obsidian-valid-for-portal-frames.patch similarity index 97% rename from patches/server/0114-Crying-obsidian-valid-for-portal-frames.patch rename to patches/server/0113-Crying-obsidian-valid-for-portal-frames.patch index b14705a22..6b1bbd21c 100644 --- a/patches/server/0114-Crying-obsidian-valid-for-portal-frames.patch +++ b/patches/server/0113-Crying-obsidian-valid-for-portal-frames.patch @@ -42,7 +42,7 @@ index 6ef81aeb4c63bc6c23163796dbd977602ca2f540..9ea3c30b679da4e77b86d96d0cc47673 private final GeneratorAccess b; private final EnumDirection.EnumAxis c; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 6e22d0cd05cc5f0d8d66b03b6484859aad0a387c..b71d3187e81241834827dc36352d87b0397d62b4 100644 +index 1a14a3f05ef42fb5161f8df2d96f4236633d641e..3311a78781739f5b7ea8a490366788b961104660 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -176,6 +176,7 @@ public class PurpurConfig { diff --git a/patches/server/0115-Entities-can-use-portals-configuration.patch b/patches/server/0114-Entities-can-use-portals-configuration.patch similarity index 100% rename from patches/server/0115-Entities-can-use-portals-configuration.patch rename to patches/server/0114-Entities-can-use-portals-configuration.patch diff --git a/patches/server/0116-LivingEntity-broadcastItemBreak.patch b/patches/server/0115-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/server/0116-LivingEntity-broadcastItemBreak.patch rename to patches/server/0115-LivingEntity-broadcastItemBreak.patch diff --git a/patches/server/0117-Customizable-wither-health-and-healing.patch b/patches/server/0116-Customizable-wither-health-and-healing.patch similarity index 100% rename from patches/server/0117-Customizable-wither-health-and-healing.patch rename to patches/server/0116-Customizable-wither-health-and-healing.patch diff --git a/patches/server/0118-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0117-Allow-toggling-special-MobSpawners-per-world.patch similarity index 100% rename from patches/server/0118-Allow-toggling-special-MobSpawners-per-world.patch rename to patches/server/0117-Allow-toggling-special-MobSpawners-per-world.patch diff --git a/patches/server/0119-Raid-cooldown-setting.patch b/patches/server/0118-Raid-cooldown-setting.patch similarity index 100% rename from patches/server/0119-Raid-cooldown-setting.patch rename to patches/server/0118-Raid-cooldown-setting.patch diff --git a/patches/server/0120-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0119-Despawn-rate-config-options-per-projectile-type.patch similarity index 100% rename from patches/server/0120-Despawn-rate-config-options-per-projectile-type.patch rename to patches/server/0119-Despawn-rate-config-options-per-projectile-type.patch diff --git a/patches/server/0121-PaperPR-Add-hex-color-code-support-for-console-loggi.patch b/patches/server/0120-PaperPR-Add-hex-color-code-support-for-console-loggi.patch similarity index 96% rename from patches/server/0121-PaperPR-Add-hex-color-code-support-for-console-loggi.patch rename to patches/server/0120-PaperPR-Add-hex-color-code-support-for-console-loggi.patch index 62c9e27b7..82deb0fe7 100644 --- a/patches/server/0121-PaperPR-Add-hex-color-code-support-for-console-loggi.patch +++ b/patches/server/0120-PaperPR-Add-hex-color-code-support-for-console-loggi.patch @@ -63,10 +63,10 @@ index 685deaa0e5d1ddc13e3a7c0471b1cfcf1710c869..2a0ada490b15b0c4939dd4304f86e016 + } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b71d3187e81241834827dc36352d87b0397d62b4..bcb9857b739e81714bc4b5ef378ae7aca640f866 100644 +index 3311a78781739f5b7ea8a490366788b961104660..c14f5325ac69fb09f47264e2e424527dafc0f249 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -221,9 +221,11 @@ public class PurpurConfig { +@@ -216,9 +216,11 @@ public class PurpurConfig { public static boolean loggerSuppressInitLegacyMaterialError = false; public static boolean loggerSuppressIgnoredAdvancementWarnings = false; diff --git a/patches/server/0122-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0121-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 100% rename from patches/server/0122-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/server/0121-Add-option-to-disable-zombie-aggressiveness-towards-.patch diff --git a/patches/server/0123-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0122-Persistent-TileEntity-Lore-and-DisplayName.patch similarity index 100% rename from patches/server/0123-Persistent-TileEntity-Lore-and-DisplayName.patch rename to patches/server/0122-Persistent-TileEntity-Lore-and-DisplayName.patch diff --git a/patches/server/0124-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0123-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0124-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0123-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0125-Flying-squids-Oh-my.patch b/patches/server/0124-Flying-squids-Oh-my.patch similarity index 100% rename from patches/server/0125-Flying-squids-Oh-my.patch rename to patches/server/0124-Flying-squids-Oh-my.patch diff --git a/patches/server/0126-Infinity-bow-settings.patch b/patches/server/0125-Infinity-bow-settings.patch similarity index 100% rename from patches/server/0126-Infinity-bow-settings.patch rename to patches/server/0125-Infinity-bow-settings.patch diff --git a/patches/server/0127-Stonecutter-damage.patch b/patches/server/0126-Stonecutter-damage.patch similarity index 100% rename from patches/server/0127-Stonecutter-damage.patch rename to patches/server/0126-Stonecutter-damage.patch diff --git a/patches/server/0128-Configurable-daylight-cycle.patch b/patches/server/0127-Configurable-daylight-cycle.patch similarity index 100% rename from patches/server/0128-Configurable-daylight-cycle.patch rename to patches/server/0127-Configurable-daylight-cycle.patch diff --git a/patches/server/0129-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0128-Allow-infinite-and-mending-enchantments-together.patch similarity index 95% rename from patches/server/0129-Allow-infinite-and-mending-enchantments-together.patch rename to patches/server/0128-Allow-infinite-and-mending-enchantments-together.patch index 9cf434732..0e372b41e 100644 --- a/patches/server/0129-Allow-infinite-and-mending-enchantments-together.patch +++ b/patches/server/0128-Allow-infinite-and-mending-enchantments-together.patch @@ -17,7 +17,7 @@ index 408cfa460920f74e0394ab27101ecb12cceb9c43..3d4e34f7070a48c436284ba7744a94ae } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index bcb9857b739e81714bc4b5ef378ae7aca640f866..bcb397b7fd326caab1573b741557fe1df99b77cc 100644 +index c14f5325ac69fb09f47264e2e424527dafc0f249..25b3dc8f745611ed75f618ef5760b45b3811b218 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -194,6 +194,16 @@ public class PurpurConfig { diff --git a/patches/server/0130-Infinite-fuel-furnace.patch b/patches/server/0129-Infinite-fuel-furnace.patch similarity index 100% rename from patches/server/0130-Infinite-fuel-furnace.patch rename to patches/server/0129-Infinite-fuel-furnace.patch diff --git a/patches/server/0131-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0130-Arrows-should-not-reset-despawn-counter.patch similarity index 100% rename from patches/server/0131-Arrows-should-not-reset-despawn-counter.patch rename to patches/server/0130-Arrows-should-not-reset-despawn-counter.patch diff --git a/patches/server/0132-Add-tablist-suffix-option-for-afk.patch b/patches/server/0131-Add-tablist-suffix-option-for-afk.patch similarity index 90% rename from patches/server/0132-Add-tablist-suffix-option-for-afk.patch rename to patches/server/0131-Add-tablist-suffix-option-for-afk.patch index 471152653..a3dd6b0b9 100644 --- a/patches/server/0132-Add-tablist-suffix-option-for-afk.patch +++ b/patches/server/0131-Add-tablist-suffix-option-for-afk.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add tablist suffix option for afk diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b5f6a98fe44c30417a3b3496dc45238c99c23ebe..5dd2c4036ee1227a0889fcc7b7e7c8b4bc373119 100644 +index a1abdd06478da22bd9c7ea4555afb36efde826c7..e98b5a1caf14f8480d1dd558e7dbe15f79d983de 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1959,7 +1959,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1961,7 +1961,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } if (world.purpurConfig.idleTimeoutUpdateTabList) { @@ -22,7 +22,7 @@ index b5f6a98fe44c30417a3b3496dc45238c99c23ebe..5dd2c4036ee1227a0889fcc7b7e7c8b4 ((WorldServer) world).everyoneSleeping(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index bcb397b7fd326caab1573b741557fe1df99b77cc..1b9046f5059cf9453f5c23cda159f4549aab4b3a 100644 +index 25b3dc8f745611ed75f618ef5760b45b3811b218..bb434bafc9ffd660096e53b5245adef9201117d2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -133,12 +133,14 @@ public class PurpurConfig { diff --git a/patches/server/0133-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0132-Ability-to-re-add-farmland-mechanics-from-Alpha.patch similarity index 100% rename from patches/server/0133-Ability-to-re-add-farmland-mechanics-from-Alpha.patch rename to patches/server/0132-Ability-to-re-add-farmland-mechanics-from-Alpha.patch diff --git a/patches/server/0134-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0133-Add-adjustable-breeding-cooldown-to-config.patch similarity index 100% rename from patches/server/0134-Add-adjustable-breeding-cooldown-to-config.patch rename to patches/server/0133-Add-adjustable-breeding-cooldown-to-config.patch diff --git a/patches/server/0135-Make-animal-breeding-times-configurable.patch b/patches/server/0134-Make-animal-breeding-times-configurable.patch similarity index 100% rename from patches/server/0135-Make-animal-breeding-times-configurable.patch rename to patches/server/0134-Make-animal-breeding-times-configurable.patch diff --git a/patches/server/0136-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0135-Apply-display-names-from-item-forms-of-entities-to-e.patch similarity index 100% rename from patches/server/0136-Apply-display-names-from-item-forms-of-entities-to-e.patch rename to patches/server/0135-Apply-display-names-from-item-forms-of-entities-to-e.patch diff --git a/patches/server/0137-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0136-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch similarity index 100% rename from patches/server/0137-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch rename to patches/server/0136-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch diff --git a/patches/server/0138-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0137-Add-twisting-and-weeping-vines-growth-rates.patch similarity index 100% rename from patches/server/0138-Add-twisting-and-weeping-vines-growth-rates.patch rename to patches/server/0137-Add-twisting-and-weeping-vines-growth-rates.patch diff --git a/patches/server/0139-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0138-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch similarity index 100% rename from patches/server/0139-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch rename to patches/server/0138-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch diff --git a/patches/server/0140-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0139-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch similarity index 100% rename from patches/server/0140-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch rename to patches/server/0139-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch diff --git a/patches/server/0141-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0140-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch similarity index 100% rename from patches/server/0141-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch rename to patches/server/0140-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch diff --git a/patches/server/0142-Add-configurable-snowball-damage.patch b/patches/server/0141-Add-configurable-snowball-damage.patch similarity index 100% rename from patches/server/0142-Add-configurable-snowball-damage.patch rename to patches/server/0141-Add-configurable-snowball-damage.patch diff --git a/patches/server/0143-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0142-Zombie-break-door-minimum-difficulty-option.patch similarity index 100% rename from patches/server/0143-Zombie-break-door-minimum-difficulty-option.patch rename to patches/server/0142-Zombie-break-door-minimum-difficulty-option.patch diff --git a/patches/server/0144-Add-demo-command.patch b/patches/server/0143-Add-demo-command.patch similarity index 98% rename from patches/server/0144-Add-demo-command.patch rename to patches/server/0143-Add-demo-command.patch index e98f11a20..e6f99afae 100644 --- a/patches/server/0144-Add-demo-command.patch +++ b/patches/server/0143-Add-demo-command.patch @@ -30,7 +30,7 @@ index 08cbc787e2bf6587878bdeffa7248e5d23cdcf98..57d39ed441ec7be933f4fce48225f527 public static final PacketPlayOutGameStateChange.a h = new PacketPlayOutGameStateChange.a(7); public static final PacketPlayOutGameStateChange.a i = new PacketPlayOutGameStateChange.a(8); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 1b9046f5059cf9453f5c23cda159f4549aab4b3a..deb82f76a1394713b7a0f594f9b6f9a756b6e9f9 100644 +index bb434bafc9ffd660096e53b5245adef9201117d2..64a8b4375b48417c2e34f0089bcf0f676faab055 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -134,6 +134,7 @@ public class PurpurConfig { diff --git a/patches/server/0145-Left-handed-API.patch b/patches/server/0144-Left-handed-API.patch similarity index 100% rename from patches/server/0145-Left-handed-API.patch rename to patches/server/0144-Left-handed-API.patch diff --git a/patches/server/0146-Origami-Fix-ProtocolLib-issues-on-Java-15.patch b/patches/server/0145-Origami-Fix-ProtocolLib-issues-on-Java-15.patch similarity index 89% rename from patches/server/0146-Origami-Fix-ProtocolLib-issues-on-Java-15.patch rename to patches/server/0145-Origami-Fix-ProtocolLib-issues-on-Java-15.patch index deaf45089..59e16c6e3 100644 --- a/patches/server/0146-Origami-Fix-ProtocolLib-issues-on-Java-15.patch +++ b/patches/server/0145-Origami-Fix-ProtocolLib-issues-on-Java-15.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Origami - Fix ProtocolLib issues on Java 15 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 7a2a8acea90a0e6f08f366c3d397a515f38e5395..8a452173c04ce5d1f7859845b99c145246abbef1 100644 +index 6a0ec0105399066dede622b45c9471b32c162cf6..548c62a838848a9183e14f91b21a9dc309d8a3b2 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java -@@ -392,9 +392,9 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -394,9 +394,9 @@ public class NetworkManager extends SimpleChannelInboundHandler> { // note: since the type is not dynamic here, we need to actually copy the old executor code // into two branches. On conflict, just re-copy - no changes were made inside the executor code. if (flush) { @@ -20,7 +20,7 @@ index 7a2a8acea90a0e6f08f366c3d397a515f38e5395..8a452173c04ce5d1f7859845b99c1452 } // Paper start -@@ -404,7 +404,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -406,7 +406,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { } try { // Paper end @@ -29,7 +29,7 @@ index 7a2a8acea90a0e6f08f366c3d397a515f38e5395..8a452173c04ce5d1f7859845b99c1452 if (genericfuturelistener != null) { -@@ -424,12 +424,12 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -426,12 +426,12 @@ public class NetworkManager extends SimpleChannelInboundHandler> { packet.onPacketDispatchFinish(player, null); } // Paper end @@ -45,7 +45,7 @@ index 7a2a8acea90a0e6f08f366c3d397a515f38e5395..8a452173c04ce5d1f7859845b99c1452 } // Paper start -@@ -439,7 +439,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -441,7 +441,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { } try { // Paper end @@ -54,7 +54,7 @@ index 7a2a8acea90a0e6f08f366c3d397a515f38e5395..8a452173c04ce5d1f7859845b99c1452 if (genericfuturelistener != null) { -@@ -459,7 +459,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -461,7 +461,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { packet.onPacketDispatchFinish(player, null); } // Paper end diff --git a/patches/server/0147-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0146-Changeable-Mob-Left-Handed-Chance.patch similarity index 100% rename from patches/server/0147-Changeable-Mob-Left-Handed-Chance.patch rename to patches/server/0146-Changeable-Mob-Left-Handed-Chance.patch diff --git a/patches/server/0148-Add-boat-fall-damage-config.patch b/patches/server/0147-Add-boat-fall-damage-config.patch similarity index 95% rename from patches/server/0148-Add-boat-fall-damage-config.patch rename to patches/server/0147-Add-boat-fall-damage-config.patch index e2cf372ec..86957e442 100644 --- a/patches/server/0148-Add-boat-fall-damage-config.patch +++ b/patches/server/0147-Add-boat-fall-damage-config.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5dd2c4036ee1227a0889fcc7b7e7c8b4bc373119..50ea875a3b31ea920442ea2cf3d3359cee1d62dc 100644 +index e98b5a1caf14f8480d1dd558e7dbe15f79d983de..6158263ee62f6cef0f441ccf369580ed4ac0865d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1017,7 +1017,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1019,7 +1019,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting { if (this.isInvulnerable(damagesource)) { return false; } else { diff --git a/patches/server/0149-Config-migration-disable-saving-projectiles-to-disk-.patch b/patches/server/0148-Config-migration-disable-saving-projectiles-to-disk-.patch similarity index 97% rename from patches/server/0149-Config-migration-disable-saving-projectiles-to-disk-.patch rename to patches/server/0148-Config-migration-disable-saving-projectiles-to-disk-.patch index 0f24e7d6a..7af19e992 100644 --- a/patches/server/0149-Config-migration-disable-saving-projectiles-to-disk-.patch +++ b/patches/server/0148-Config-migration-disable-saving-projectiles-to-disk-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: disable saving projectiles to disk -> diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index deb82f76a1394713b7a0f594f9b6f9a756b6e9f9..d01982330edcaad92e2f398abe2ae6169a3f7600 100644 +index 64a8b4375b48417c2e34f0089bcf0f676faab055..7e2a79763d857517db8ea73b276f6f6814c770ae 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ diff --git a/patches/server/0150-Snow-Golem-rate-of-fire-config.patch b/patches/server/0149-Snow-Golem-rate-of-fire-config.patch similarity index 100% rename from patches/server/0150-Snow-Golem-rate-of-fire-config.patch rename to patches/server/0149-Snow-Golem-rate-of-fire-config.patch diff --git a/patches/server/0151-PaperPR-Apply-advancements-async.patch b/patches/server/0150-PaperPR-Apply-advancements-async.patch similarity index 96% rename from patches/server/0151-PaperPR-Apply-advancements-async.patch rename to patches/server/0150-PaperPR-Apply-advancements-async.patch index 791577d2a..4943ca41d 100644 --- a/patches/server/0151-PaperPR-Apply-advancements-async.patch +++ b/patches/server/0150-PaperPR-Apply-advancements-async.patch @@ -51,10 +51,10 @@ index 98c3884f478aed1eba82c15f258ebfa1c7203b14..244b58a7c41d2b0ba3117550282e68a1 } catch (ParseException parseexception) { throw new JsonSyntaxException("Invalid datetime: " + s, parseexception); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 50ea875a3b31ea920442ea2cf3d3359cee1d62dc..cc6a54e06a4fe91a19dee0397192e9884597835e 100644 +index 6158263ee62f6cef0f441ccf369580ed4ac0865d..cee95fa977aa7df57a411b79be688e6b949b05d5 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -49,7 +49,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -51,7 +51,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; public final Deque removeQueue = new ArrayDeque<>(); // Paper @@ -64,7 +64,7 @@ index 50ea875a3b31ea920442ea2cf3d3359cee1d62dc..cc6a54e06a4fe91a19dee0397192e988 private final ServerStatisticManager serverStatisticManager; private float lastHealthScored = Float.MIN_VALUE; private int lastFoodScored = Integer.MIN_VALUE; -@@ -136,7 +137,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -138,7 +139,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.playerInteractManager = playerinteractmanager; this.server = minecraftserver; this.serverStatisticManager = minecraftserver.getPlayerList().getStatisticManager(this); @@ -73,7 +73,7 @@ index 50ea875a3b31ea920442ea2cf3d3359cee1d62dc..cc6a54e06a4fe91a19dee0397192e988 this.G = 1.0F; //this.c(worldserver); // Paper - don't move to spawn on login, only first join this.co = minecraftserver.a(this); -@@ -505,7 +506,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -507,7 +508,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { CriterionTriggers.u.a(this, this.cf, this.ticksLived - this.cg); } @@ -83,7 +83,7 @@ index 50ea875a3b31ea920442ea2cf3d3359cee1d62dc..cc6a54e06a4fe91a19dee0397192e988 // Purpur start if (this.world.purpurConfig.useNightVisionWhenRiding && this.getVehicle() != null && this.getVehicle().getRider() == this && world.getTime() % 100 == 0) { // 5 seconds -@@ -2121,7 +2123,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -2123,7 +2125,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.worldChangeInvuln = false; } diff --git a/patches/server/0152-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0151-PaperPR-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0152-PaperPR-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0151-PaperPR-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0153-EMC-Configurable-disable-give-dropping.patch b/patches/server/0152-EMC-Configurable-disable-give-dropping.patch similarity index 95% rename from patches/server/0153-EMC-Configurable-disable-give-dropping.patch rename to patches/server/0152-EMC-Configurable-disable-give-dropping.patch index c3b0f6b84..474ec9600 100644 --- a/patches/server/0153-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0152-EMC-Configurable-disable-give-dropping.patch @@ -20,7 +20,7 @@ index 1d22c45af884a917e77e02c272fcbae74794200c..7bf90f27fdc48440ef229cca0e100d2c itemstack.setCount(1); entityitem = entityplayer.drop(itemstack, false); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d01982330edcaad92e2f398abe2ae6169a3f7600..db61ab72eeff9db45440773c7185e8ae072cfc55 100644 +index 7e2a79763d857517db8ea73b276f6f6814c770ae..4ece8e25b66d4eea627f4d17e74e9605ad6e8ae4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -188,6 +188,11 @@ public class PurpurConfig { diff --git a/patches/server/0154-Config-migration-climbing-should-not-bypass-cramming.patch b/patches/server/0153-Config-migration-climbing-should-not-bypass-cramming.patch similarity index 96% rename from patches/server/0154-Config-migration-climbing-should-not-bypass-cramming.patch rename to patches/server/0153-Config-migration-climbing-should-not-bypass-cramming.patch index e0c28c715..7cb0554b5 100644 --- a/patches/server/0154-Config-migration-climbing-should-not-bypass-cramming.patch +++ b/patches/server/0153-Config-migration-climbing-should-not-bypass-cramming.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: climbing should not bypass cramming diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index db61ab72eeff9db45440773c7185e8ae072cfc55..17914340051d67b0c3bb80c56b8d3ee4ea772015 100644 +index 4ece8e25b66d4eea627f4d17e74e9605ad6e8ae4..669b427459a070088ce641004a4074504f7202f7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -142,6 +142,17 @@ public class PurpurConfig { diff --git a/patches/server/0155-Lobotomize-stuck-villagers.patch b/patches/server/0154-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/server/0155-Lobotomize-stuck-villagers.patch rename to patches/server/0154-Lobotomize-stuck-villagers.patch diff --git a/patches/server/0156-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0155-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 100% rename from patches/server/0156-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0155-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch diff --git a/patches/server/0157-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0156-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 100% rename from patches/server/0157-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0156-Toggle-for-Zombified-Piglin-death-always-counting-as.patch diff --git a/patches/server/0158-Spread-out-and-optimise-player-list-ticks.patch b/patches/server/0157-Spread-out-and-optimise-player-list-ticks.patch similarity index 100% rename from patches/server/0158-Spread-out-and-optimise-player-list-ticks.patch rename to patches/server/0157-Spread-out-and-optimise-player-list-ticks.patch diff --git a/patches/server/0159-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0158-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 100% rename from patches/server/0159-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0158-Configurable-chance-for-wolves-to-spawn-rabid.patch diff --git a/patches/server/0160-Configurable-default-wolf-collar-color.patch b/patches/server/0159-Configurable-default-wolf-collar-color.patch similarity index 100% rename from patches/server/0160-Configurable-default-wolf-collar-color.patch rename to patches/server/0159-Configurable-default-wolf-collar-color.patch diff --git a/patches/server/0161-Configurable-entity-base-attributes.patch b/patches/server/0160-Configurable-entity-base-attributes.patch similarity index 100% rename from patches/server/0161-Configurable-entity-base-attributes.patch rename to patches/server/0160-Configurable-entity-base-attributes.patch diff --git a/patches/server/0162-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0161-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0162-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0161-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0163-Phantom-flames-on-swoop.patch b/patches/server/0162-Phantom-flames-on-swoop.patch similarity index 100% rename from patches/server/0163-Phantom-flames-on-swoop.patch rename to patches/server/0162-Phantom-flames-on-swoop.patch diff --git a/patches/server/0164-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0163-Option-for-chests-to-open-even-with-a-solid-block-on.patch similarity index 100% rename from patches/server/0164-Option-for-chests-to-open-even-with-a-solid-block-on.patch rename to patches/server/0163-Option-for-chests-to-open-even-with-a-solid-block-on.patch diff --git a/patches/server/0165-Implement-TPSBar.patch b/patches/server/0164-Implement-TPSBar.patch similarity index 100% rename from patches/server/0165-Implement-TPSBar.patch rename to patches/server/0164-Implement-TPSBar.patch diff --git a/patches/server/0166-Striders-give-saddle-back.patch b/patches/server/0165-Striders-give-saddle-back.patch similarity index 100% rename from patches/server/0166-Striders-give-saddle-back.patch rename to patches/server/0165-Striders-give-saddle-back.patch