mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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 9fdcbf5c9b
commit 825d17c326
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
5 changed files with 22 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Spigot-API-Patches/0120-Vex-getSummoner-API.patch
View file

@ -1,4 +1,4 @@
From 31def18565e09b797cffabedeff88881b21ba67e Mon Sep 17 00:00:00 2001
From ed4de91ce14776b268c13b40d31e75e477fb96c5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 15:29:21 -0400
Subject: [PATCH] Vex#getSummoner API
@ -6,21 +6,19 @@ Subject: [PATCH] Vex#getSummoner API
Get's the Mob that summoned this Vex
diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
index a2f2fcae..d395e405 100644
index 6b61c4ab..7b9b21e5 100644
--- a/src/main/java/org/bukkit/entity/Vex.java
+++ b/src/main/java/org/bukkit/entity/Vex.java
@@ -3,4 +3,10 @@ package org.bukkit.entity;
/**
* Represents a Vex.
*/
-public interface Vex extends Monster { }
+public interface Vex extends Monster {
@@ -22,4 +22,9 @@ public interface Vex extends Monster {
* @param charging new state
*/
void setCharging(boolean charging);
+
+ /**
+ * @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex
+ */
+ Mob getSummoner(); // Paper
+
+}
}
--
2.20.1
2.21.0

21
Spigot-API-Patches/0158-Allow-setting-the-vex-s-summoner.patch
View file

@ -1,34 +1,35 @@
From 0386e908841eba3bb839cf0369d23eabebb8b440 Mon Sep 17 00:00:00 2001
From 6772c9bcb0f4cad1a8f63120a2b266bd1b129a46 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 6 Oct 2018 21:47:09 -0500
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
@@ -7,6 +7,19 @@ public interface Vex extends Monster {
/**
* @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex
@@ -23,8 +23,19 @@ public interface Vex extends Monster {
*/
- 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
}
--
2.20.1
2.21.0