Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: 840e72091 [CI-SKIP] [Auto] Rebuild Patches a33232d4a Add beacon activation and deactivation events (#5121) bc7ea673a Add internal channel initialization listeners (#5557) b28ad17ac Check for world change in MoveEvent API methods 3095c7592 [Auto] Updated Upstream (CraftBukkit) f56989c97 Add RespawnFlags to PlayerRespawnEvent (#5533) 7579c2667 Add more API to PlayerMoveEvent (#5553)
2026-02-19 17:37:42 +01:00 · 2021-04-30 16:15:10 -05:00
parent 3af86add35
commit 1d3f710297
204 changed files with 38 additions and 501 deletions
--- a/patches/server/0018-Player-invulnerabilities.patch
+++ b/patches/server/0018-Player-invulnerabilities.patch
@@ -1,134 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 2 May 2020 20:55:44 -0500
-Subject: [PATCH] Player invulnerabilities
-
-
-diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 598b30244e74a56d62dc4ace5362225447860a0a..f59d7e245aa3768004c7f82837a7482260a53406 100644
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -284,6 +284,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
-+
-+        this.invulnerableTicks = world.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
-     }
-     // Paper start
-     public BlockPosition getPointInFront(double inFront) {
-@@ -1119,6 +1121,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
- 
-     }
- 
-+    // Purpur start
-+    public boolean isSpawnInvulnerable() {
-+        return invulnerableTicks > 0 || frozen;
-+    }
-+    // Purpur end
-+
-     @Override
-     public boolean damageEntity(DamageSource damagesource, float f) {
-         if (this.isInvulnerable(damagesource)) {
-@@ -1126,7 +1134,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-         } else {
-             boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
- 
-            if (!flag && this.invulnerableTicks > 0 && damagesource != DamageSource.OUT_OF_WORLD) {
-+            if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur
-                 return false;
-             } else {
-                 if (damagesource instanceof EntityDamageSource) {
-@@ -1302,6 +1310,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-             }
-             // Paper end
- 
-+            this.invulnerableTicks = worldserver.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
-             return this;
-         }
-     }
-@@ -2489,9 +2498,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
- 
-     @Override
-     public boolean isFrozen() { // Paper - protected > public
-        return super.isFrozen() || (this.playerConnection != null && this.playerConnection.isDisconnected()); // Paper
-+        return super.isFrozen() || frozen || (this.playerConnection != null && this.playerConnection.isDisconnected()); // Paper // Purpur
-     }
- 
-+    // Purpur start
-+    private boolean frozen = false;
-+
-+    public void setFrozen(boolean frozen) {
-+        this.frozen = frozen;
-+    }
-+    // Purpur end
-+
-     @Override
-     public Scoreboard getScoreboard() {
-         return getBukkitEntity().getScoreboard().getHandle();
-diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 15349a7bddcad5a4a6db07a8aa6ae8d06163b1f6..37663436c1ffed4552cdcdac7a5c09fe9b632fee 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -1896,6 +1896,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
-         PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
-         // Paper start
-         PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
-+        player.setFrozen(packStatus == PlayerResourcePackStatusEvent.Status.ACCEPTED); // Purpur
-         player.getBukkitEntity().setResourcePackStatus(packStatus);
-         this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
-         // Paper end
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c705bf1e651a764d56b87ebc5a86a938d8bd34bb..9360d35581c6961a768973cc31341381ee26e234 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1009,6 +1009,8 @@ public abstract class PlayerList {
-         }
-         // Paper end
- 
-+        entityplayer1.invulnerableTicks = entityplayer1.world.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
-+
-         // CraftBukkit end
-         return entityplayer1;
-     }
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42050927dc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -67,4 +67,11 @@ public class PurpurWorldConfig {
-         idleTimeoutCountAsSleeping = getBoolean("gameplay-mechanics.player.idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
-         idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
-     }
-+
-+    public int playerSpawnInvulnerableTicks = 60;
-+    public boolean playerInvulnerableWhileAcceptingResourcePack = false;
-+    private void playerInvulnerabilities() {
-+        playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
-+        playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
-+    }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f4052aaa2235894b996d65c569a083f1a09b59a3..1ff48eae5e5b732fbd1e720c55e08a30669bebfa 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2507,5 +2507,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public void resetIdleTimer() {
-         getHandle().resetIdleTimer();
-     }
-+
-+    @Override
-+    public boolean isSpawnInvulnerable() {
-+        return getHandle().isSpawnInvulnerable();
-+    }
-+
-+    @Override
-+    public int getSpawnInvulnerableTicks() {
-+        return getHandle().invulnerableTicks;
-+    }
-+
-+    @Override
-+    public void setSpawnInvulnerableTicks(int invulnerableTicks) {
-+        getHandle().invulnerableTicks = invulnerableTicks;
-+    }
-     // Purpur end
- }