Skip to content

Commit 49db849

Browse files
grannygranny
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e01ddf4 Fixup porting issue in vanillaBiomeProvider impl (#11185) PaperMC/Paper@509ea2f Fix horse armor desync (#11341) PaperMC/Paper@2f0891e Fix InventoryOpenEvent cancellation (#11304) PaperMC/Paper@227c94a Fix inventory desync when placing blocks with spawn protection (#11090)
1 parent 5c0d2f7 commit 49db849

14 files changed

+37
-37
lines changed

‎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 = 25621248d3f30f35c3458b4b13a2474ffd0bee0e
5+
paperCommit = 227c94ae21634e3cba5992ac29bb2b258f039067
66

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

‎patches/server/0008-Component-related-conveniences.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
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 cb25a8796dda84fb08865a2af769fb4d10597685..ffc7f4f4544df21b713b780eded8aeba4090db52 100644
8+
index 2e45bc48c8a86d9522e4574bf3037611cfda63a3..98fd4d8aab273ab86bcb9b95a331cd8bbcb61373 100644
99
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
1010
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
11-
@@ -2004,6 +2004,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
11+
@@ -2008,6 +2008,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
1212
this.lastSentExp = -1; // CraftBukkit - Added to reset
1313
}
1414

@@ -81,7 +81,7 @@ index bb1a60180e58c1333e7bb33e8acf1b0225eda8a8..c83e80ebdbbfb2d0e08561a44486a308
8181
return this.type().msgId();
8282
}
8383
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
84-
index 52af2341b1ce1ee358d60505f34018a5acd09176..9dd838972d83196dfda620b223ea17fbf7c125a4 100644
84+
index b3b602076e18b45ce773bafba8f6811aba5321ec..e2907879dbe758ffe728d77ebde434b1e7382a96 100644
8585
--- a/src/main/java/net/minecraft/world/entity/Entity.java
8686
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
8787
@@ -4185,6 +4185,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

‎patches/server/0011-Barrels-and-enderchests-6-rows.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,19 @@ index a15d5ff872dbd77f3c3145e0328f3d02e431ff8c..1dcf36d502990d32fc4cd3ea69c3ea33
108108
this.activeChest = blockEntity;
109109
}
110110
diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
111-
index ca92d49ef2010ba00c623491671dcde8ebe697c1..bd65df4588584b8bb001e9dc3656a14e381a0b6d 100644
111+
index 491a59336899179c79820cd61541d49f7337c0f6..492fda30f22c8d09271931229ec02bb6f98f5889 100644
112112
--- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
113113
+++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
114-
@@ -91,7 +91,7 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
115-
EnderChestBlockEntity enderChestBlockEntity = (EnderChestBlockEntity)blockEntity;
114+
@@ -92,7 +92,7 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
116115
playerEnderChestContainer.setActiveChest(enderChestBlockEntity);
117-
player.openMenu(
116+
// Paper start - Fix InventoryOpenEvent cancellation
117+
if (player.openMenu(
118118
- new SimpleMenuProvider((i, inventory, playerx) -> ChestMenu.threeRows(i, inventory, playerEnderChestContainer), CONTAINER_TITLE)
119119
+ new SimpleMenuProvider((i, inventory, playerx) -> org.purpurmc.purpur.PurpurConfig.enderChestSixRows ? getEnderChestSixRows(i, inventory, player, playerEnderChestContainer) : ChestMenu.threeRows(i, inventory, playerEnderChestContainer), CONTAINER_TITLE) // Purpur
120-
);
121-
player.awardStat(Stats.OPEN_ENDERCHEST);
122-
PiglinAi.angerNearbyPiglins(player, true);
123-
@@ -102,6 +102,35 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
120+
).isPresent()) {
121+
player.awardStat(Stats.OPEN_ENDERCHEST);
122+
PiglinAi.angerNearbyPiglins(player, true);
123+
@@ -105,6 +105,35 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
124124
}
125125
}
126126

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ 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 6cad742f0141ac0e4b4b5a1dd07874eb7588e70f..fe0bbaec0a47305da244bbca7b9ce64015ea39b8 100644
8+
index be4226b968e02fa88deb851ecb76130034e56695..d4a05d40cb15b6b73d12976d3b25d71215dc04ea 100644
99
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
1010
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
11-
@@ -2367,8 +2367,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
11+
@@ -2371,8 +2371,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
1212

1313
public void resetLastActionTime() {
1414
this.lastActionTime = Util.getMillis();
@@ -78,7 +78,7 @@ index 6cad742f0141ac0e4b4b5a1dd07874eb7588e70f..fe0bbaec0a47305da244bbca7b9ce640
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 8345c9b767d9dabbaeb8bcc09cefd3a298759399..ba98e98a09e141d45bda8a663d5e4354e3afbc1e 100644
81+
index cc801cbefbbb54b8f9fa29bb37c00eca8e7ae44b..41f57991c9b42ee71d480f7f04a9007ae6a1d2d4 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

‎patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
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 f9d2cb898e8f19accf30de609b5f0b1ef17fa9c7..7899793cf22f79e4d1acbac052ee273e6b2ad12f 100644
8+
index 14df0de1e1abe154991c77319a73dbb3a709af80..aca60e21e7a191212d07a03a105fc4fb636359b2 100644
99
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
1010
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
11-
@@ -3033,4 +3033,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
11+
@@ -3037,4 +3037,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
1212
return (CraftPlayer) super.getBukkitEntity();
1313
}
1414
// CraftBukkit end

‎patches/server/0114-Option-for-chests-to-open-even-with-a-solid-block-on.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for chests to open even with a solid block on top
55

66

77
diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
8-
index 8fbfd18b3caeed769396b3ffb1b1778b2f38edc0..dbfe8f5d4df244cb694b73ea8763628c5f2507a3 100644
8+
index 0b27baf10770cb3077c4e75da55209689d614513..485ea9892f257c6843db23bca43f9fdcd8fa1503 100644
99
--- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
1010
+++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
11-
@@ -343,6 +343,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
11+
@@ -342,6 +342,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
1212
}
1313

1414
public static boolean isBlockedChestByBlock(BlockGetter world, BlockPos pos) {

‎patches/server/0115-Implement-TPSBar.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ index ca9afa93a9c43208ef64f86d534e5540d34a6b09..e0f7c6fa2a545d54135da6357440b79a
4141
}
4242
}
4343
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
44-
index 6df90eecd59421972661a297519325de5e44908e..97e05432626ae78b3ac91d41bbe0784c61d3d184 100644
44+
index 0b57d9a2e2573bdb41c9e163d953130c3a4a1747..6100c35a54a9f597bb7e4925bf2c63aa7e0d64d3 100644
4545
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
4646
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
4747
@@ -303,6 +303,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -68,7 +68,7 @@ index 6df90eecd59421972661a297519325de5e44908e..97e05432626ae78b3ac91d41bbe0784c
6868
}
6969

7070
// CraftBukkit start - World fallback code, either respawn location or global spawn
71-
@@ -3063,5 +3066,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
71+
@@ -3067,5 +3070,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
7272
this.server.getPlayerList().respawn(this, true, RemovalReason.KILLED, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH, to);
7373
}
7474
}
@@ -83,7 +83,7 @@ index 6df90eecd59421972661a297519325de5e44908e..97e05432626ae78b3ac91d41bbe0784c
8383
// Purpur end
8484
}
8585
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
86-
index 105688ba795676a0612969f89668c9c8bda48f54..8b02ceeb89286c09ece26054ebe70a61c296dfd6 100644
86+
index d13270623d0630f94c7911bd8a544f1ee9449b17..cac3aa0308b4f9a4c563840f974651d20bdf195f 100644
8787
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
8888
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
8989
@@ -480,6 +480,7 @@ public abstract class PlayerList {

‎patches/server/0140-Sneak-to-bulk-process-composter.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Sneak to bulk process composter
55

66

77
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
8-
index cc01ead133cc6859ca5d7a1d0ac3c12955e590da..9c035bfd8c75561886d5ff63f1df4acca6f71595 100644
8+
index ee9e4521079137d7b72194e8789810e7a89b8e75..09ab1904ea9c587f365513150dafe434a0b56ccf 100644
99
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
1010
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
11-
@@ -578,7 +578,7 @@ public class ServerPlayerGameMode {
11+
@@ -577,7 +577,7 @@ public class ServerPlayerGameMode {
1212
ItemStack itemstack1 = stack.copy();
1313
InteractionResult enuminteractionresult;
1414

‎patches/server/0190-Add-compass-command.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ index 9f86a0397c0b64cb31dad245e2dc84d0fadd42d7..a66e2d78722847dec4e9d4aba8e6968e
1717

1818
if (environment.includeIntegrated) {
1919
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
20-
index a54b89a9be5e9712e991a03ed33c4051656de513..552c4baba3d4562afdc1b253f6949371b654edac 100644
20+
index d1d1ceabdf6b0bd254fefd64e2504f0865e0c9b2..996bfac666762096fe322e54c2134bab0c08c950 100644
2121
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
2222
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
2323
@@ -304,6 +304,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -44,7 +44,7 @@ index a54b89a9be5e9712e991a03ed33c4051656de513..552c4baba3d4562afdc1b253f6949371
4444
}
4545

4646
// CraftBukkit start - World fallback code, either respawn location or global spawn
47-
@@ -3088,5 +3091,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
47+
@@ -3092,5 +3095,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
4848
public void tpsBar(boolean tpsBar) {
4949
this.tpsBar = tpsBar;
5050
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Shift right click to use exp for mending
55

66

77
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
8-
index fe734df8b4521101c3e55c042957a531b3bdf945..7c06b284a6cc74c0b31f8921706c7796dcc4e402 100644
8+
index d3c49951c0bd7db4352326d3113f0ca9da393fab..28731f0c5b0ba63fa8d5ce3ee580bf314a844f92 100644
99
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
1010
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
1111
@@ -518,6 +518,7 @@ public class ServerPlayerGameMode {
@@ -16,7 +16,7 @@ index fe734df8b4521101c3e55c042957a531b3bdf945..7c06b284a6cc74c0b31f8921706c7796
1616
BlockPos blockposition = hitResult.getBlockPos();
1717
BlockState iblockdata = world.getBlockState(blockposition);
1818
boolean cancelledBlock = false;
19-
@@ -627,4 +628,18 @@ public class ServerPlayerGameMode {
19+
@@ -626,4 +627,18 @@ public class ServerPlayerGameMode {
2020
public void setLevel(ServerLevel world) {
2121
this.level = world;
2222
}
@@ -36,7 +36,7 @@ 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 747da684de2611e56c58617c2cf42547796c9660..0dadf75aa1b9c245127d00ea90144e54f8700ff1 100644
39+
index d806f43e76d15da500c1c04392aad483ddcd8a9a..636c9a47585890d6c6c609e491f0d17be4bf52c7 100644
4040
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
4141
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
4242
@@ -2075,6 +2075,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

0 commit comments

Comments
 (0)