From 22b876a304d23e418cc07649ae932c6c045c20ff Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 15 Jan 2021 10:26:39 -0600 Subject: [PATCH] Forgot the setters in api of last commit --- patches/api/0027-Item-entity-immunities.patch | 11 +++++++++-- patches/server/0078-Item-entity-immunities.patch | 9 +++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/patches/api/0027-Item-entity-immunities.patch b/patches/api/0027-Item-entity-immunities.patch index dc1f8a275..852ef6388 100644 --- a/patches/api/0027-Item-entity-immunities.patch +++ b/patches/api/0027-Item-entity-immunities.patch @@ -5,16 +5,23 @@ Subject: [PATCH] Item entity immunities diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index 0ee072645ecf1bf5feb74de6960947ef76db366e..b96d2d8c9129b1a0363951fbb637815be3ce8d72 100644 +index 0ee072645ecf1bf5feb74de6960947ef76db366e..cf3eb7a57e28a76c40e5efa192204766fc037bf5 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java -@@ -120,4 +120,41 @@ public interface Item extends Entity { +@@ -120,4 +120,48 @@ public interface Item extends Entity { */ public void setWillAge(boolean willAge); // Paper end + + // Purpur start + /** ++ * Set whether or not this item is immune to cactus ++ * ++ * @param immuneToCactus True to make immune to cactus ++ */ ++ void setImmuneToCactus(boolean immuneToCactus); ++ ++ /** + * Check if item is immune to cactus + * + * @return True if immune to cactus diff --git a/patches/server/0078-Item-entity-immunities.patch b/patches/server/0078-Item-entity-immunities.patch index 59d60edf0..857018beb 100644 --- a/patches/server/0078-Item-entity-immunities.patch +++ b/patches/server/0078-Item-entity-immunities.patch @@ -126,16 +126,21 @@ index 886c3b98d6bff04a93cd963a092654ef1c9729d1..75250392135f416e766e44ffdad7eecd public boolean idleTimeoutTickNearbyEntities = true; public boolean idleTimeoutCountAsSleeping = false; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index bcbaad11852a51436a00c8e172bdd841ba93ec3c..8e8eaa2df20773948ec160b94798fb8ca74c326a 100644 +index bcbaad11852a51436a00c8e172bdd841ba93ec3c..8c0b618ac66688f1fef42ae292745c2844aa12df 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -@@ -114,4 +114,31 @@ public class CraftItem extends CraftEntity implements Item { +@@ -114,4 +114,36 @@ public class CraftItem extends CraftEntity implements Item { public EntityType getType() { return EntityType.DROPPED_ITEM; } + + // Purpur start + @Override ++ public void setImmuneToCactus(boolean immuneToCactus) { ++ item.immuneToCactus = immuneToCactus; ++ } ++ ++ @Override + public boolean isImmuneToCactus() { + return item.immuneToCactus; + }