twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-31 20:22:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream B/CB

Browse Source 
--- work/Bukkit
Submodule work/Bukkit 96e09e50..0b95b68f:
  > SPIGOT-4650: Charging API for Vex

--- work/CraftBukkit
Submodule work/CraftBukkit f102d882..77ca7ca0:
  > Rebuild patches
  > Improve damage handling of dead entities
  > SPIGOT-4646: Test + fix InventoryWrapper.getContents
  > SPIGOT-4650: Charging API for Vex
This commit is contained in:
Zach Brown
2019-03-06 00:46:21 -05:00
parent bf3ce069c8
commit a663d0d550
5 changed files with 17 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Spigot-API-Patches/Allow-setting-the-vex-s-summoner.patch
View File

@@ -5,27 +5,28 @@ 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 d395e405..78f0082e 100644
index 7b9b21e5..23a15f8f 100644
--- a/src/main/java/org/bukkit/entity/Vex.java
+++ b/src/main/java/org/bukkit/entity/Vex.java
@@ -0,0 +0,0 @@ public interface Vex extends Monster {
/**
* @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex
*/
- Mob getSummoner(); // Paper
void setCharging(boolean charging);
+ // Paper start
+ /**
/**
- * @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex
+ * Get the Mob that summoned this vex
+ *
+ * @return Mob that summoned this vex
+ */
+ Mob getSummoner();
+
+ /**
+ * Set the summoner of this vex
+ *
+ * @param summoner New summoner
+ */
*/
- Mob getSummoner(); // Paper
+ void setSummoner(Mob summoner);
+ // Paper end
}