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

Updated Upstream (Paper)

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

Paper Changes:
d5cb9308f fix #5224
d23f8b62e fix? #5222
0f2575de2 fix? #5222
7c3499702 fix? #5218
c8eec830b fix #5217
a235c77ce Adventure 4.5.0
This commit is contained in:
jmp
2021-02-22 04:42:43 -08:00
parent 55af1079b5
commit 274c7b2ccc
15 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 511cd52f02...d5cb9308f2

2
patches/api/0001-Tuinity-API-Changes.patch
View File

@@ -8,7 +8,7 @@ Tuinity config
API to retrieve raw YamlConfiguration + timing exports
diff --git a/pom.xml b/pom.xml
index 5bc8dd2489d34c598f8079d13058eeb0a9b79713..74ca13bb403f86aa8f6510972a5c076002ed787a 100644
index 0d922ea17c675d6e3a7106937918d2a818814fba..6c88a9d9f2292e1e65bd631aedbe15e0430d3af4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@

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

@@ -13756,10 +13756,10 @@ index 49008cdec739b19409fdaf1b0ed806a6c0e93200..61570ab947b5a153a4c2bcb5a09344f0
}
// Paper end - optimised tracker
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d26708986c1b6e2 100644
index ad33505bb7896dce6c4381b4652316ef734e9e48..9bd88a7a42ede0029b79eae51a4b7acf1db3fc97 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -419,7 +419,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -423,7 +423,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
@@ -13770,7 +13770,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
}
@@ -432,12 +434,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -436,12 +438,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
return;
}
@@ -13786,7 +13786,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
double d11 = d7;
d6 = d3 - entity.locX();
@@ -451,16 +455,25 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -455,16 +459,25 @@ public class PlayerConnection implements PacketListenerPlayIn {
boolean flag1 = false;
if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
@@ -13816,7 +13816,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
entity.setLocation(d0, d1, d2, f, f1);
player.setLocation(d0, d1, d2, this.player.yaw, this.player.pitch); // CraftBukkit
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
@@ -546,7 +559,32 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -550,7 +563,32 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
private boolean a(Entity entity) {
@@ -13850,7 +13850,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
}
@Override
@@ -1068,7 +1106,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1072,7 +1110,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.teleportPos != null) {
@@ -13859,7 +13859,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
@@ -1138,7 +1176,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1142,7 +1180,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed = player.abilities.walkSpeed * 10f;
}
// Paper start - Prevent moving into unloaded chunks
@@ -13868,7 +13868,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
return;
}
@@ -1155,7 +1193,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1159,7 +1197,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
@@ -13877,7 +13877,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
d7 = d4 - this.o;
d8 = d5 - this.p;
@@ -1194,6 +1232,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1198,6 +1236,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -13885,7 +13885,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
// Paper start - prevent position desync
if (this.teleportPos != null) {
@@ -1213,12 +1252,23 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1217,12 +1256,23 @@ public class PlayerConnection implements PacketListenerPlayIn {
boolean flag1 = false;
if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
@@ -13911,7 +13911,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
this.a(d0, d1, d2, f, f1);
} else {
// CraftBukkit start - fire PlayerMoveEvent
@@ -1305,6 +1355,26 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1309,6 +1359,26 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
@@ -14122,7 +14122,7 @@ index 114e986e5132e5e4bb42d0f08a067429bce53ba6..05656ea8448aa569e8dd480461e2d5f7
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 4a20235f34dc272b0a7939b97cf3448919c4f753..60b2e560bbf4c5303e9334a496c6ced0e3c88b19 100644
index fefe71f95f94cae9e8d3d3de344155b5cd357fff..8e49de2f89aded40d760d57f4ddfcb84f73deb1d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -100,6 +100,7 @@ public abstract class PlayerList {

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

@@ -149,7 +149,7 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 8c8359bb696afb579796b23a4d26708986c1b6e2..72bd179a0b2a07be3924b37fa9fb853df50a454d 100644
index 9bd88a7a42ede0029b79eae51a4b7acf1db3fc97..7034f2d09b7e9911cba7834832a901389e6690dc 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -252,6 +252,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -165,7 +165,7 @@ index 8c8359bb696afb579796b23a4d26708986c1b6e2..72bd179a0b2a07be3924b37fa9fb853d
this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
this.disconnect(new ChatMessage("multiplayer.disconnect.idling"));
}
@@ -517,6 +523,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -521,6 +527,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -174,7 +174,7 @@ index 8c8359bb696afb579796b23a4d26708986c1b6e2..72bd179a0b2a07be3924b37fa9fb853d
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1253,7 +1261,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1257,7 +1265,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; // Tuinity - diff on change, this should be moved wrongly
@@ -183,7 +183,7 @@ index 8c8359bb696afb579796b23a4d26708986c1b6e2..72bd179a0b2a07be3924b37fa9fb853d
}
this.player.setLocation(d4, d5, d6, f, f1);
@@ -1303,6 +1311,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1307,6 +1315,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();

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

@@ -67,10 +67,10 @@ index 771f634a06eca998853830d78b4d1546dd2b4c67..f4f6e85bd98ce57bf2daeb9ea30bccc2
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 72bd179a0b2a07be3924b37fa9fb853df50a454d..797b09fa01b039bd5f8ab30f0c4686dc7e1efe71 100644
index 7034f2d09b7e9911cba7834832a901389e6690dc..371285e86ef6d848c2a1c5eb1ce4bc2428405ccd 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1733,6 +1733,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1737,6 +1737,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -79,7 +79,7 @@ index 72bd179a0b2a07be3924b37fa9fb853df50a454d..797b09fa01b039bd5f8ab30f0c4686dc
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 60b2e560bbf4c5303e9334a496c6ced0e3c88b19..6beb06bfce96d364122ceda6d702cfb7315e4312 100644
index 8e49de2f89aded40d760d57f4ddfcb84f73deb1d..3416691e1fa95fc94dcc2dccf4722e324e2ff33b 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -918,6 +918,8 @@ public abstract class PlayerList {

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

@@ -17,7 +17,7 @@ index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 797b09fa01b039bd5f8ab30f0c4686dc7e1efe71..9b509d7aeba8297107c74f8a1429edc25edfb5ee 100644
index 371285e86ef6d848c2a1c5eb1ce4bc2428405ccd..82ac1971278c98d1d09e18b8e0abaacc358efcac 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -86,6 +86,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -50,7 +50,7 @@ index 797b09fa01b039bd5f8ab30f0c4686dc7e1efe71..9b509d7aeba8297107c74f8a1429edc2
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
@@ -2909,6 +2925,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2913,6 +2929,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

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

@@ -17,10 +17,10 @@ index f4f6e85bd98ce57bf2daeb9ea30bccc25fdae8ec..a76d4ed8a0baa09340fcf58e647afa1c
this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 9b509d7aeba8297107c74f8a1429edc25edfb5ee..09c084e212fd6250656ad6c60e9884d2e23fe348 100644
index 82ac1971278c98d1d09e18b8e0abaacc358efcac..0054c4ec899146e5bb8cebebba2db2a0efc35323 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2903,6 +2903,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2907,6 +2907,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 6beb06bfce96d364122ceda6d702cfb7315e4312..f8a3475af20ceed0e4ad5b6d779e848af43114e7 100644
index 3416691e1fa95fc94dcc2dccf4722e324e2ff33b..7734c06663b77a55b9ee87e72246919ade0fd039 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1077,6 +1077,7 @@ public abstract class PlayerList {

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

@@ -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 09c084e212fd6250656ad6c60e9884d2e23fe348..3c63788c7119d1fcd4c08f4e1d6e93da23e50e08 100644
index 0054c4ec899146e5bb8cebebba2db2a0efc35323..fd3c9904afa5eb6175d308ab046801cee7a21297 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1054,7 +1054,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1058,7 +1058,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (itemstack.getItem() == Items.WRITABLE_BOOK) {
NBTTagList nbttaglist = new NBTTagList();
@@ -18,7 +18,7 @@ index 09c084e212fd6250656ad6c60e9884d2e23fe348..3c63788c7119d1fcd4c08f4e1d6e93da
ItemStack old = itemstack.cloneItemStack(); // CraftBukkit
itemstack.a("pages", (NBTBase) nbttaglist);
CraftEventFactory.handleEditBookEvent(player, i, old, itemstack); // CraftBukkit
@@ -1072,13 +1073,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1076,13 +1077,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
itemstack1.setTag(nbttagcompound.clone());
}
@@ -35,7 +35,7 @@ index 09c084e212fd6250656ad6c60e9884d2e23fe348..3c63788c7119d1fcd4c08f4e1d6e93da
ChatComponentText chatcomponenttext = new ChatComponentText(s1);
String s2 = IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) chatcomponenttext);
@@ -1090,6 +1092,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1094,6 +1096,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}

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

@@ -92,10 +92,10 @@ index 9807441d53fcf4ef7aaffe3801542f5a371eb7af..43cdeaae22bf020d0b3c1e1c56e65e73
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3c63788c7119d1fcd4c08f4e1d6e93da23e50e08..7ffc3c1d41b3b8fdd8f0e48f991f0ae4e1294c53 100644
index fd3c9904afa5eb6175d308ab046801cee7a21297..cdcf02a73d3dffecac3605f0c7438075e5bceac3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2299,6 +2299,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2303,6 +2303,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;

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

@@ -4956,10 +4956,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 7ffc3c1d41b3b8fdd8f0e48f991f0ae4e1294c53..050d6db2a6a0bd5922efd720f5a0cd99b3090144 100644
index cdcf02a73d3dffecac3605f0c7438075e5bceac3..c926b8b1f1233a3320c7f901162b2b4a098cff8c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2308,6 +2308,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2312,6 +2312,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.server.getPluginManager().callEvent(event);

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Spread out and optimise player list ticks
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index f8a3475af20ceed0e4ad5b6d779e848af43114e7..47f916a7fc2581720b628ffa6c720af2e459fd92 100644
index 7734c06663b77a55b9ee87e72246919ade0fd039..b0aa5fbb145ed86e96f1a95abab96352c3175c8b 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -73,7 +73,7 @@ public abstract class PlayerList {

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

@@ -37,7 +37,7 @@ index eea187723c1931a5db9a2d79a1abddd664d890a1..33d43478b1bc4b0ca3f16ba80e0cd99b
this.isRestarting = isRestarting;
if (flag) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 47f916a7fc2581720b628ffa6c720af2e459fd92..8f60273865d9f49420e25da71edc61175896fc62 100644
index b0aa5fbb145ed86e96f1a95abab96352c3175c8b..7b68d74f5b0917cce463c4f1c4e628ac5617da23 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -517,6 +517,8 @@ public abstract class PlayerList {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerBookTooLargeEvent
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 050d6db2a6a0bd5922efd720f5a0cd99b3090144..f6b120e2dc7f925cb0af11e7599f16194f7ca6c6 100644
index c926b8b1f1233a3320c7f901162b2b4a098cff8c..8162a8e252f12af2d0ecd6c2febc31a5bd619606 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -966,6 +966,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -970,6 +970,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
NBTTagList pageList = testStack.getTag().getList("pages", 8);
if (pageList.size() > 100) {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send a book with too many pages");
@@ -16,7 +16,7 @@ index 050d6db2a6a0bd5922efd720f5a0cd99b3090144..f6b120e2dc7f925cb0af11e7599f1619
minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));
return;
}
@@ -978,6 +979,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -982,6 +983,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
if (byteLength > 256 * 4) {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send a book with with a page too large!");
@@ -24,7 +24,7 @@ index 050d6db2a6a0bd5922efd720f5a0cd99b3090144..f6b120e2dc7f925cb0af11e7599f1619
minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));
return;
}
@@ -1001,6 +1003,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1005,6 +1007,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (byteTotal > byteAllowed) {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed: "+ byteAllowed + " - Pages: " + pageList.size());

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerEditBookEvent not saving new book
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f6b120e2dc7f925cb0af11e7599f16194f7ca6c6..7d0881aeb8ce0314dd5188e5320791a5fa4baadb 100644
index 8162a8e252f12af2d0ecd6c2febc31a5bd619606..7137759447e65c96abfe3b5ef181b8ce33294df4 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1061,7 +1061,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1065,7 +1065,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
list.stream().map(s -> s = color(s, hasPerm, false)).map(NBTTagString::a).forEach(nbttaglist::add); // Purpur - edit book
ItemStack old = itemstack.cloneItemStack(); // CraftBukkit
itemstack.a("pages", (NBTBase) nbttaglist);