Updated Upstream (Bukkit/CraftBukkit) (#7776)

2022-04-30 17:27:41 +01:00
parent 8d72e2dfb2
commit 655a3cf961
10 changed files with 71 additions and 59 deletions
--- a/patches/api/Allow-setting-the-vex-s-summoner.patch
+++ b/patches/api/Allow-setting-the-vex-s-summoner.patch
@@ -8,20 +8,12 @@ diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Vex.java
 +++ b/src/main/java/org/bukkit/entity/Vex.java
-@@ -0,0 +0,0 @@
- package org.bukkit.entity;
- 
-+import org.jetbrains.annotations.Nullable;
-+
- /**
-  * Represents a Vex.
-  */
@@ -0,0 +0,0 @@ public interface Vex extends Monster {
-      * @param charging new state
+      * @return true if the entity has limited life
      */
-     void setCharging(boolean charging);
-+
+     boolean hasLimitedLife();
 +    // Paper start
+
 +    /**
 +     * Get the Mob that summoned this vex
 +     *