Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: 466820160 Upstream Update (#5211) 2a0ee4b65 Add support for hex color codes in console 4e958e229 We're going on an Adventure! (#4842) 1a9735611 Stop loop when flags set to false (#5101) a5928db4a [Auto] Updated Upstream (CraftBukkit)
2026-02-20 18:07:43 +01:00 · 2021-02-21 13:00:30 -08:00
parent c08f028635
commit b538cd9fba
188 changed files with 178 additions and 366 deletions
--- a/patches/server/0017-Player-invulnerabilities.patch
+++ b/patches/server/0017-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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index af4fb76d000594229e0c0dfdcde48fbafc087de0..5e157aabc8326a32a6a1825fef0f9813b5abe8f6 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -151,6 +151,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) {
-@@ -992,6 +994,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)) {
-@@ -999,7 +1007,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) {
-@@ -1175,6 +1183,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-             }
-             // Paper end
- 
-+            this.invulnerableTicks = worldserver.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
-             return this;
-         }
-     }
-@@ -2345,9 +2354,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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1d810a9b23d236493db121dde92c7ebce25a25fe..218ebc7befca683607b0b9863384a5b5d6bd3a2f 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 {
-         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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index eabd1aa2b740bcb6db40be300cd6daf59674fa3f..46043d3a4f4056fff93b867c65d363ac1277db7a 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -915,6 +915,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 e319f3b1282af8019ae706f46e3978e789fbc877..62ef7bb712e91fed150bf9c16c11635a9aaaab67 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2238,5 +2238,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
- }