Skip to content

Commit 07979c3

Browse files
grannygranny
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@ab0d24a Configuration for horizontal-only item merging (#11219) PaperMC/Paper@098bd39 Remove arbitrary book page limit (#11228) PaperMC/Paper@f97aff7 [ci skip] Fix Effect javadocs (#11182) PaperMC/Paper@4a97ba3 Fix `setSendViewDistance`'s return (#11247) PaperMC/Paper@1798e94 Fix BasicCommand suggestion arg count (#11241) PaperMC/Paper@7c9240f Improve standard messenger logging
1 parent 366af80 commit 07979c3

9 files changed

Lines changed: 32 additions & 35 deletions

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.21.1-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.1
5-
paperCommit = dd941cc40a25a4c6217f09c121b891962726f3ee
5+
paperCommit = 7c9240f4a63b13be1fdcedbfb0270f9b49b75518
66

77
org.gradle.caching = true
88
org.gradle.parallel = true

‎patches/server/0007-Ridables.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ index 2fe9d9b38c01d04416843fdd48d3e33899b7de63..559bec25060eb8981bf80213ceedb79d
4646
public LevelChunk getChunkIfLoaded(int x, int z) {
4747
return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
4848
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
49-
index 37adf5d3c6248547d830248714f32dbec653d653..f21573f92d6703d74203b205aa2aebd0588a12e7 100644
49+
index 2bd74f003b132b9925002ac79ea066973c9047a4..50ff7afa040c54e538e191322146df48c6675df0 100644
5050
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
5151
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
5252
@@ -805,6 +805,15 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -66,10 +66,10 @@ index 37adf5d3c6248547d830248714f32dbec653d653..f21573f92d6703d74203b205aa2aebd0
6666

6767
private void updatePlayerAttributes() {
6868
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
69-
index 624b80c796e9c95040d71d1595d11f98e2899cf3..152aff15307dabafdd0f3b3cf8f61b216c5d9f3f 100644
69+
index 60ff21c8df4168f14da04a12073bde47cd4693c4..a7f7c140b2c6ee936699e25a72b7e4fcb3705b97 100644
7070
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
7171
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
72-
@@ -2717,6 +2717,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
72+
@@ -2712,6 +2712,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
7373

7474
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
7575

‎patches/server/0011-AFK-API.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
55

66

77
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
8-
index f21573f92d6703d74203b205aa2aebd0588a12e7..585b41a7e890aa6b5ea27f8fb84a8ca0310ddeb6 100644
8+
index 50ff7afa040c54e538e191322146df48c6675df0..f19907853edae46b0db4edcbec286add2da6c5f6 100644
99
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
1010
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
1111
@@ -2368,8 +2368,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -78,7 +78,7 @@ index f21573f92d6703d74203b205aa2aebd0588a12e7..585b41a7e890aa6b5ea27f8fb84a8ca0
7878
return this.stats;
7979
}
8080
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
81-
index 82f60de72bc0f9b01eb97dbc0e296e80579b0968..07d8b2536c2c95b91467edd2ece8674eeaa6ad2f 100644
81+
index a7f7c140b2c6ee936699e25a72b7e4fcb3705b97..a38be909672f833b70ae74817673e6080e4a467a 100644
8282
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8383
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8484
@@ -332,6 +332,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -124,7 +124,7 @@ index 82f60de72bc0f9b01eb97dbc0e296e80579b0968..07d8b2536c2c95b91467edd2ece8674e
124124
Location oldTo = to.clone();
125125
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
126126
this.cserver.getPluginManager().callEvent(event);
127-
@@ -1454,7 +1476,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
127+
@@ -1449,7 +1471,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
128128
movedWrongly = true;
129129
if (event.getLogWarning())
130130
// Paper end
@@ -133,7 +133,7 @@ index 82f60de72bc0f9b01eb97dbc0e296e80579b0968..07d8b2536c2c95b91467edd2ece8674e
133133
} // Paper
134134
}
135135

136-
@@ -1512,6 +1534,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
136+
@@ -1507,6 +1529,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
137137
this.lastYaw = to.getYaw();
138138
this.lastPitch = to.getPitch();
139139

@@ -223,7 +223,7 @@ index 141b748abe80402731cdaf14a3d36aa7cef4f4bd..d5d2a6467b48bcf8e5322dd5938f6e4f
223223
if (range < 0.0 || d < range * range) {
224224
return true;
225225
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
226-
index c2e0baa40e556fd8bb2ae406b321da01f1d05079..1faf1c4b777333030d164e277ee3552900f10cd3 100644
226+
index 39bb873b5207e83aef36dbf362079eaff31fbb9e..263c4fd61219bb151d9b58fac5d5a75a3dae7029 100644
227227
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
228228
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
229229
@@ -576,10 +576,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

‎patches/server/0069-Allow-color-codes-in-books.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow color codes in books
55

66

77
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8-
index 07d8b2536c2c95b91467edd2ece8674eeaa6ad2f..68c4e3d9a3f928a52357e25820ac73adbfb3332c 100644
8+
index a38be909672f833b70ae74817673e6080e4a467a..4319a191f03caa56baeecdc537b61aacfa2291cd 100644
99
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1010
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
11-
@@ -1203,10 +1203,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
11+
@@ -1198,10 +1198,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
1212

1313
Objects.requireNonNull(list);
1414
stream.forEach(list::add);
@@ -25,7 +25,7 @@ index 07d8b2536c2c95b91467edd2ece8674eeaa6ad2f..68c4e3d9a3f928a52357e25820ac73ad
2525
};
2626

2727
this.filterTextPacket((List) list).thenAcceptAsync(consumer, this.server);
28-
@@ -1214,13 +1218,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
28+
@@ -1209,13 +1213,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2929
}
3030

3131
private void updateBookContents(List<FilteredText> pages, int slotId) {
@@ -45,7 +45,7 @@ index 07d8b2536c2c95b91467edd2ece8674eeaa6ad2f..68c4e3d9a3f928a52357e25820ac73ad
4545

4646
itemstack.set(DataComponents.WRITABLE_BOOK_CONTENT, new WritableBookContent(list1));
4747
this.player.getInventory().setItem(slotId, CraftEventFactory.handleEditBookEvent(this.player, slotId, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
48-
@@ -1228,6 +1237,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
48+
@@ -1223,6 +1232,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
4949
}
5050

5151
private void signBook(FilteredText title, List<FilteredText> pages, int slotId) {
@@ -57,7 +57,7 @@ index 07d8b2536c2c95b91467edd2ece8674eeaa6ad2f..68c4e3d9a3f928a52357e25820ac73ad
5757
ItemStack itemstack = this.player.getInventory().getItem(slotId);
5858

5959
if (itemstack.is(Items.WRITABLE_BOOK)) {
60-
@@ -1235,10 +1249,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
60+
@@ -1230,10 +1244,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
6161

6262
itemstack1.remove(DataComponents.WRITABLE_BOOK_CONTENT);
6363
List<Filterable<Component>> list1 = (List<Filterable<Component>>) (List) pages.stream().map((filteredtext1) -> { // CraftBukkit - decompile error
@@ -70,7 +70,7 @@ index 07d8b2536c2c95b91467edd2ece8674eeaa6ad2f..68c4e3d9a3f928a52357e25820ac73ad
7070
CraftEventFactory.handleEditBookEvent(this.player, slotId, itemstack, itemstack1); // CraftBukkit
7171
this.player.getInventory().setItem(slotId, itemstack); // CraftBukkit - event factory updates the hand book
7272
}
73-
@@ -1248,6 +1262,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
73+
@@ -1243,6 +1257,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
7474
return this.player.isTextFilteringEnabled() ? Filterable.passThrough(message.filteredOrEmpty()) : Filterable.from(message);
7575
}
7676

‎patches/server/0070-Entity-lifespan.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan
55

66

77
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8-
index 99d78eace196c5ad93d19c709862d8db7582f80b..600b8280c11032339c056b2b3ad371674072e2c2 100644
8+
index 4319a191f03caa56baeecdc537b61aacfa2291cd..1908af9183d290a1a6815866ba10172d05ff56d1 100644
99
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1010
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
11-
@@ -2752,6 +2752,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
11+
@@ -2747,6 +2747,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
1212
AABB axisalignedbb = entity.getBoundingBox();
1313

1414
if (this.player.canInteractWithEntity(axisalignedbb, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(1.0D))) { // Paper - configurable lenience value for interact range

‎patches/server/0115-PlayerBookTooLargeEvent.patch‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,26 @@ Subject: [PATCH] PlayerBookTooLargeEvent
55

66

77
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8-
index 600b8280c11032339c056b2b3ad371674072e2c2..46cc4aabf1fb349d1ecead78c0041b9de8cde99d 100644
8+
index 1908af9183d290a1a6815866ba10172d05ff56d1..ea4ac42372919722109cd85c213877b892e8fcf9 100644
99
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1010
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
11-
@@ -1152,10 +1152,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
11+
@@ -1152,6 +1152,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
1212
int maxBookPageSize = io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.pageMax;
13-
double multiplier = Math.max(0.3D, Math.min(1D, io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier));
13+
double multiplier = Math.clamp(io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier, 0.3D, 1D);
1414
long byteAllowed = maxBookPageSize;
1515
+ // Purpur start
1616
+ int slot = packet.slot();
1717
+ ItemStack itemstack = Inventory.isHotbarSlot(slot) || slot == Inventory.SLOT_OFFHAND ? this.player.getInventory().getItem(slot) : ItemStack.EMPTY;
1818
+ // Purpur end
1919
for (String testString : pageList) {
2020
int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
21-
if (byteLength > 256 * 4) {
22-
ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send a book with with a page too large!");
23-
+ org.purpurmc.purpur.event.player.PlayerBookTooLargeEvent event = new org.purpurmc.purpur.event.player.PlayerBookTooLargeEvent(player.getBukkitEntity(), itemstack.asBukkitCopy()); if (event.shouldKickPlayer()) // Purpur
24-
this.disconnect(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause
25-
return;
26-
}
27-
@@ -1179,6 +1184,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
21+
byteTotal += byteLength;
22+
@@ -1173,7 +1177,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
23+
}
2824

2925
if (byteTotal > byteAllowed) {
30-
ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed: "+ byteAllowed + " - Pages: " + pageList.size());
26+
- ServerGamePacketListenerImpl.LOGGER.warn("{} tried to send a book too large. Book size: {} - Allowed: {} - Pages: {}", this.player.getScoreboardName(), byteTotal, byteAllowed, pageList.size());
27+
+ ServerGamePacketListenerImpl.LOGGER.warn("{} tried to send too large of a book. Book size: {} - Allowed: {} - Pages: {}", this.player.getScoreboardName(), byteTotal, byteAllowed, pageList.size());
3128
+ org.purpurmc.purpur.event.player.PlayerBookTooLargeEvent event = new org.purpurmc.purpur.event.player.PlayerBookTooLargeEvent(player.getBukkitEntity(), itemstack.asBukkitCopy()); if (event.shouldKickPlayer()) // Purpur
3229
this.disconnect(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause
3330
return;

‎patches/server/0127-Dont-run-with-scissors.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Dont run with scissors!
66
inspired by https://modrinth.com/mod/dont-run-with-scissors
77

88
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
9-
index 46cc4aabf1fb349d1ecead78c0041b9de8cde99d..29c567fc3a7e4b30b670eeda2fd28cc55e57e451 100644
9+
index ea4ac42372919722109cd85c213877b892e8fcf9..f4392eb11dfba8b7423b6e917a38fa44be5c35fa 100644
1010
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1111
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
12-
@@ -1610,6 +1610,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
12+
@@ -1604,6 +1604,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
1313
this.player.tryResetCurrentImpulseContext();
1414
}
1515

@@ -23,7 +23,7 @@ index 46cc4aabf1fb349d1ecead78c0041b9de8cde99d..29c567fc3a7e4b30b670eeda2fd28cc5
2323
this.player.checkMovementStatistics(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5);
2424
this.lastGoodX = this.player.getX();
2525
this.lastGoodY = this.player.getY();
26-
@@ -1637,6 +1644,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
26+
@@ -1631,6 +1638,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2727
}
2828
}
2929

‎patches/server/0204-Shift-right-click-to-use-exp-for-mending.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ index fe734df8b4521101c3e55c042957a531b3bdf945..7c06b284a6cc74c0b31f8921706c7796
3636
+ // Purpur end
3737
}
3838
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
39-
index 29c567fc3a7e4b30b670eeda2fd28cc55e57e451..c0c854296bc920cf79d710ad4896a895ff45c058 100644
39+
index f4392eb11dfba8b7423b6e917a38fa44be5c35fa..95494ad10f18bb6b700e11b6c338a52ff5a880cc 100644
4040
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
4141
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
42-
@@ -2004,6 +2004,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
42+
@@ -1998,6 +1998,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
4343

4444
boolean cancelled;
4545
if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {

‎patches/server/0253-Add-more-logger-output-for-invalid-movement-kicks.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more logger output for invalid movement kicks
55

66

77
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8-
index c0c854296bc920cf79d710ad4896a895ff45c058..ed8825f1bcd8e182078f16dd717cf232223ed208 100644
8+
index 95494ad10f18bb6b700e11b6c338a52ff5a880cc..3c038a992083f96b6406e786c5bb1177c1fe4c51 100644
99
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1010
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1111
@@ -721,6 +721,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -16,7 +16,7 @@ index c0c854296bc920cf79d710ad4896a895ff45c058..ed8825f1bcd8e182078f16dd717cf232
1616
this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
1717
return;
1818
}
19-
@@ -1327,7 +1328,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
19+
@@ -1321,7 +1322,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2020
@Override
2121
public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
2222
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());

0 commit comments

Comments
 (0)