Updated Upstream (Bukkit/CraftBukkit) (#7776)

2022-04-30 17:27:41 +01:00 · 2022-04-30 17:27:41 +01:00 · 4166632333
commit 4166632333
parent 608482d512
33 changed files with 144 additions and 132 deletions
--- a/patches/api/0121-Allow-setting-the-vex-s-summoner.patch
+++ b/patches/api/0121-Allow-setting-the-vex-s-summoner.patch
@ -5,23 +5,15 @@ Subject: [PATCH] Allow setting the vex's summoner


 diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
-index 6b61c4ab773c731fe5ae9577fd13e44707be9787..c34a3ea7b4d16817b4bee25d5c69787e22ec44d8 100644
+index dc21f3ba648ab02a2b75ec429501143398c356f6..627e3c1a96ae3331f5aa2dd7803dd2a31c7204be 100644
 --- a/src/main/java/org/bukkit/entity/Vex.java
 +++ b/src/main/java/org/bukkit/entity/Vex.java
-@@ -1,5 +1,7 @@
- package org.bukkit.entity;
- 
-+import org.jetbrains.annotations.Nullable;
-+
- /**
-  * Represents a Vex.
-  */
-@@ -22,4 +24,21 @@ public interface Vex extends Monster {
-      * @param charging new state
+@@ -73,4 +73,21 @@ public interface Vex extends Monster {
+      * @return true if the entity has limited life
      */
-     void setCharging(boolean charging);
-+
+     boolean hasLimitedLife();
 +    // Paper start
+
 +    /**
 +     * Get the Mob that summoned this vex
 +     *