add back pufferfish patches \o/

2026-02-17 16:37:43 +01:00 · 2023-12-25 20:15:34 -08:00
parent 10685bb957
commit 6f17a3da52
360 changed files with 841 additions and 820 deletions
--- a/patches/server/0282-Fire-Immunity-API.patch
+++ b/patches/server/0282-Fire-Immunity-API.patch
@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Racci <90304606+DaRacci@users.noreply.github.com>
-Date: Fri, 4 Feb 2022 16:10:21 +1100
-Subject: [PATCH] Fire Immunity API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b45064a92674a4c48350c466b8131bf1ffae4335..1e2308ecde7bef57ac0b6192b8362cbcd58e6725 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -422,6 +422,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
-     private UUID originWorld;
-     public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
-     public boolean fixedPose = false; // Paper
-+    public @Nullable Boolean immuneToFire = null; // Purpur - Fire immune API
- 
-     public void setOrigin(@javax.annotation.Nonnull Location location) {
-         this.origin = location.toVector();
-@@ -1800,7 +1801,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
-     }
- 
-     public boolean fireImmune() {
-        return this.getType().fireImmune();
-+        return this.immuneToFire != null ? immuneToFire : this.getType().fireImmune(); // Purpur - add fire immune API
-     }
- 
-     public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
-@@ -2492,6 +2493,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
-                 nbttagcompound.putBoolean("Paper.FreezeLock", true);
-             }
-             // Paper end
-+            // Purpur start
-+            if (immuneToFire != null) {
-+                nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire);
-+            }
-+            // Purpur end
-             return nbttagcompound;
-         } catch (Throwable throwable) {
-             CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2639,6 +2645,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
-                 freezeLocked = nbt.getBoolean("Paper.FreezeLock");
-             }
-             // Paper end
-+            // Purpur start
-+            if (nbt.contains("Purpur.FireImmune")) {
-+                immuneToFire = nbt.getBoolean("Purpur.FireImmune");
-+            }
-+            // Purpur end
- 
-         } catch (Throwable throwable) {
-             CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1ac0f0faab8d6a22429f16ea745640bba65ef4ab..752b32e4086e84d68e088fdaabec941bb134d61e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -83,6 +83,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         this.entityType = CraftEntityType.minecraftToBukkit(entity.getType());
-     }
- 
-+    @Override
-+    public boolean isImmuneToFire() {
-+        return getHandle().fireImmune();
-+    }
-+
-+    @Override
-+    public void setImmuneToFire(Boolean fireImmune) {
-+        getHandle().immuneToFire = fireImmune;
-+    }
-+
-     @Override
-     public boolean isInDaylight() {
-         return getHandle().isSunBurnTick();
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 14d6ff11c8b8b047ada5d308515e9d214cf77b69..ba33fb0b049a670851004022da18fe744dca27eb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -173,9 +173,14 @@ public class CraftItem extends CraftEntity implements Item {
-         return this.getHandle().immuneToExplosion;
-     }
- 
-+    @Override
-+    public void setImmuneToFire(@org.jetbrains.annotations.Nullable Boolean immuneToFire) {
-+        this.getHandle().immuneToFire = (immuneToFire != null && immuneToFire);
-+    }
-+
-     @Override
-     public void setImmuneToFire(boolean immuneToFire) {
-        item.immuneToFire = immuneToFire;
-+        this.setImmuneToFire((Boolean) immuneToFire);
-     }
- 
-     @Override