Tuinity! \o/

2026-02-21 02:17:42 +01:00 · 2020-07-01 19:31:44 -05:00
parent 2b54ad49f6
commit 7503e60580
127 changed files with 7711 additions and 514 deletions
--- a/patches/server/0024-Player-invulnerabilities.patch
+++ b/patches/server/0024-Player-invulnerabilities.patch
@@ -1,144 +0,0 @@
-From 0828a5d793cb60992427e2f0af477835712183fb 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
-
---
- .../net/minecraft/server/EntityPlayer.java    | 21 +++++++++++++++++--
- .../minecraft/server/PlayerConnection.java    |  1 +
- .../java/net/minecraft/server/PlayerList.java |  2 ++
- .../net/pl3x/purpur/PurpurWorldConfig.java    |  7 +++++++
- .../craftbukkit/entity/CraftPlayer.java       | 15 +++++++++++++
- 5 files changed, 44 insertions(+), 2 deletions(-)
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 508a91418e..07f8f0fa7d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -141,6 +141,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) {
-@@ -801,6 +803,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)) {
-@@ -808,7 +816,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) {
-@@ -1054,6 +1062,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-             PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
-             this.world.getServer().getPluginManager().callEvent(changeEvent);
-             // CraftBukkit end
-+            this.invulnerableTicks = worldserver.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
-             return this;
-         }
-     }
-@@ -2149,9 +2158,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 0d8daf4569..47a7d1c034 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1563,6 +1563,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 3c5ba8f2fd..5807e77dab 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -869,6 +869,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 5fa3330373..bd9b82dadf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -75,4 +75,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 3bd2ffc206..9b1c4d9320 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2144,5 +2144,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
- }
-- 
-2.26.2
-