Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.

Commit 9b57576

Browse files
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3af5e771 Add Player#give (#11995) PaperMC/Paper@7e21cb81 fix PlayerChangedMainHandEvent javadoc (#12020) PaperMC/Paper@5a34bf04 Correctly retrun true for empty input shapes in EntityGetter#isUnobstructed PaperMC/Paper@a392d475 Make Watchdog thread extend TickThread
1 parent 5583a3f commit 9b57576

4 files changed

Lines changed: 14 additions & 12 deletions

File tree

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.4-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.4
5-
paperCommit = fb5b173c6a742c584413c8fc8b7c871d79234756
5+
paperCommit = a392d475c28c62f25992de49d5d137b098e4ad92
66

77
org.gradle.configuration-cache = true
88
org.gradle.caching = true

purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
--- a/src/main/java/org/bukkit/entity/Player.java
22
+++ b/src/main/java/org/bukkit/entity/Player.java
3-
@@ -3892,4 +_,123 @@
3+
@@ -3928,4 +_,123 @@
4+
* @return the result of this method, holding leftovers and spawned items.
45
*/
5-
void sendEntityEffect(org.bukkit.@NotNull EntityEffect effect, @NotNull Entity target);
6-
// Paper end - entity effect API
6+
@NotNull PlayerGiveResult give(@NotNull Collection<@NotNull ItemStack> items, boolean dropIfFull);
77
+
88
+ // Purpur start
99
+ /**

purpur-server/paper-patches/features/0005-Add-EntityTeleportHinderedEvent.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ index c843d28de6cdd7fa25cfbfe7cf071de063df05f8..3bb597cbce650e408273c07a7c120845
2929
}
3030

3131
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
32-
index 5c3c4afe3a319810763156bdfc7305d96e6b7b11..6165a7ed3c3f1fa9e6be737dbfc094609d0f9c96 100644
32+
index fa850e952a01fbdc0c51ebe4055c82a6c3086fbb..f4d45ef506172c7c8ca65beeee7536f09c0c0284 100644
3333
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
3434
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
35-
@@ -1433,6 +1433,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
35+
@@ -1438,6 +1438,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3636
// Paper start - Teleport passenger API
3737
// Don't allow teleporting between worlds while keeping passengers
3838
if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {
3939
+ if (!new org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent(entity.getBukkitEntity(), org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent.Reason.IS_VEHICLE, cause).callEvent()) // Purpur - Add EntityTeleportHinderedEvent
4040
return false;
4141
}
4242

43-
@@ -1454,6 +1455,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
43+
@@ -1459,6 +1460,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
4444
}
4545

4646
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
3-
@@ -586,10 +_,15 @@
3+
@@ -591,10 +_,15 @@
44

55
@Override
66
public void setPlayerListName(String name) {
@@ -17,7 +17,7 @@
1717
if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
1818
for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
1919
if (player.getBukkitEntity().canSee(this)) {
20-
@@ -2747,6 +_,28 @@
20+
@@ -2752,6 +_,28 @@
2121
return this.getHandle().getAbilities().walkingSpeed * 2f;
2222
}
2323

@@ -46,16 +46,18 @@
4646
private void validateSpeed(float value) {
4747
Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value);
4848
}
49-
@@ -3545,4 +_,74 @@
50-
this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundEntityEventPacket(((CraftEntity) target).getHandle(), effect.getData()));
49+
@@ -3581,4 +_,76 @@
50+
handle.containerMenu.broadcastChanges();
51+
return new PaperPlayerGiveResult(leftovers.build(), drops.build());
5152
}
52-
// Paper end - entity effect API
53+
+
5354
+ // Purpur start - Purpur client support
5455
+ @Override
5556
+ public boolean usesPurpurClient() {
5657
+ return getHandle().purpurClient;
5758
+ }
5859
+ // Purpur end - Purpur client support
60+
+
5961
+ // Purpur start - AFK API
6062
+ @Override
6163
+ public boolean isAfk() {

0 commit comments

Comments
 (0)