Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Also add canDespawn()

This commit is contained in:
Cryptite 2023-06-27 12:30:27 -05:00
parent a75f35cec4
commit 37ca070bc7
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/api/0421-Add-Warden-setCanDespawn.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add Warden setCanDespawn
diff --git a/src/main/java/org/bukkit/entity/Warden.java b/src/main/java/org/bukkit/entity/Warden.java diff --git a/src/main/java/org/bukkit/entity/Warden.java b/src/main/java/org/bukkit/entity/Warden.java
index efaa45f41bc1dc8df6665c55b4e5ade343d60d4c..8a519db7bd153901db5049ae1b55943fd2ff7fb1 100644 index efaa45f41bc1dc8df6665c55b4e5ade343d60d4c..3daaec3a7498fd15d71d1939fb4d338ed1f717ea 100644
--- a/src/main/java/org/bukkit/entity/Warden.java --- a/src/main/java/org/bukkit/entity/Warden.java
+++ b/src/main/java/org/bukkit/entity/Warden.java +++ b/src/main/java/org/bukkit/entity/Warden.java
@@ -111,4 +111,12 @@ public interface Warden extends Monster { @@ -111,4 +111,18 @@ public interface Warden extends Monster {
*/ */
ANGRY; ANGRY;
} }
@ -19,5 +19,11 @@ index efaa45f41bc1dc8df6665c55b4e5ade343d60d4c..8a519db7bd153901db5049ae1b55943f
+ * + *
+ * @param canDespawn Whether the Warden will ever attempt to despawn + * @param canDespawn Whether the Warden will ever attempt to despawn
+ */ + */
+ void setCanDespawn(boolean canDespawn); // Paper end + void setCanDespawn(boolean canDespawn);
+
+ /**
+ * @return Whether the Warden will despawn if idle
+ */
+ boolean canDespawn();
+ // Paper end
} }

9
patches/server/0982-Add-Warden-setCanDespawn.patch
View File

@ -38,10 +38,10 @@ index 03f16a5541de6bc95407aaa24741570c1993dc9e..0468eca241c88e82f8f36daf1d4eda3b
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
index 6ecdc4bf1f6b8f0363e667135ba463433be5c0fb..ca84aab93edaf4649ff9dd7887f39f18d51560c4 100644 index 6ecdc4bf1f6b8f0363e667135ba463433be5c0fb..eb3e3839593c7f8cc42f845a5dead9849ce6f3a2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
@@ -92,4 +92,11 @@ public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warde @@ -92,4 +92,16 @@ public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warde
case ANGRY -> AngerLevel.ANGRY; case ANGRY -> AngerLevel.ANGRY;
}; };
} }
@ -51,5 +51,10 @@ index 6ecdc4bf1f6b8f0363e667135ba463433be5c0fb..ca84aab93edaf4649ff9dd7887f39f18
+ public void setCanDespawn(boolean canDespawn) { + public void setCanDespawn(boolean canDespawn) {
+ this.getHandle().canDespawn = canDespawn; + this.getHandle().canDespawn = canDespawn;
+ } + }
+
+ @Override
+ public boolean canDespawn() {
+ return this.getHandle().canDespawn;
+ }
+ // Paper end + // Paper end
} }