mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
d5d756bc32
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c1b4899 Fix dupe uuid check on entity add (#6735) PaperMC/Paper@3f043f7 Async catch modifications to critical entity state PaperMC/Paper@bc43f40 Update jline and TCA (#6829) PaperMC/Paper@d9e2817 Update paperweight to 1.1.13 (#6866) PaperMC/Paper@3e310e0 Remove redundant and unneeded repos, reorder repos (#6867) PaperMC/Paper@485d15f Update paperweight to 1.1.14 (#6868) PaperMC/Paper@09d50a9 Added missing mappings (#6810) PaperMC/Paper@0968cdd Move async catches back to where they were (#6869) PaperMC/Paper@6f71b7c Deduplicate strings in ObfHelper (#6841) PaperMC/Paper@ada930b Updated Upstream (Bukkit/CraftBukkit) (#6872) PaperMC/Paper@06d82e0 Cache palette array (#6767) PaperMC/Paper@70fe58d Expose the potential player cause of a lightning (#6782) PaperMC/Paper@c20c9d3 Fix CraftNamespacedKey shenanigans (#6825) PaperMC/Paper@29bb5a9 Add PlayerDeathEvent#getPlayer for clarity (#6859) PaperMC/Paper@124d079 Fix issues with mob conversion (#6831) PaperMC/Paper@22b0238 Add API for checking if a zombie has the option to break doors (#6855) PaperMC/Paper@5af80b0 Add isCollidable methods to various places (#6870) PaperMC/Paper@32ba088 Fix setPatternColor on tropical fish bucket meta (#6877) PaperMC/Paper@87121ce Move `getTrackedPlayers` up from Player to Entity (#6569) PaperMC/Paper@a923e33 Make despawn distance configs per-category, improve per category spawn limit config (#6717) PaperMC/Paper@3f17694 Goat ram API (#6336) PaperMC/Paper@cc2ecbc Add Raw Byte Entity Serialization (#6826) Airplane Changes: TECHNOVE/Airplane@e47949b Ty Penple <3 TECHNOVE/Airplane@86fee6b Update upstream
82 lines
2.9 KiB
Diff
82 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 3 Jul 2021 18:45:01 -0500
|
|
Subject: [PATCH] Summoner API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/IronGolem.java b/src/main/java/org/bukkit/entity/IronGolem.java
|
|
index 655e37cb3a09610a3f3df805d6dcad17d722da62..09fd716c8fc9ea34a1cbf87bcbe22df035422a51 100644
|
|
--- a/src/main/java/org/bukkit/entity/IronGolem.java
|
|
+++ b/src/main/java/org/bukkit/entity/IronGolem.java
|
|
@@ -19,4 +19,20 @@ public interface IronGolem extends Golem {
|
|
* player created, false if you want it to be a natural village golem.
|
|
*/
|
|
public void setPlayerCreated(boolean playerCreated);
|
|
+
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * Get the player that summoned this iron golem
|
|
+ *
|
|
+ * @return UUID of summoner
|
|
+ */
|
|
+ @org.jetbrains.annotations.Nullable java.util.UUID getSummoner();
|
|
+
|
|
+ /**
|
|
+ * Set the player that summoned this iron golem
|
|
+ *
|
|
+ * @param summoner UUID of summoner
|
|
+ */
|
|
+ void setSummoner(@org.jetbrains.annotations.Nullable java.util.UUID summoner);
|
|
+ // Purpur end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java
|
|
index 10f8f6d45ae9280651c3ebddd1f90acbd7d6ff29..34f9d1b5d66ca96c71a94ebc981752e40019e575 100644
|
|
--- a/src/main/java/org/bukkit/entity/Snowman.java
|
|
+++ b/src/main/java/org/bukkit/entity/Snowman.java
|
|
@@ -23,4 +23,20 @@ public interface Snowman extends Golem, RangedEntity { // Paper
|
|
* @param derpMode True to remove the pumpkin, false to add a pumpkin
|
|
*/
|
|
void setDerp(boolean derpMode);
|
|
+
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * Get the player that summoned this snowman
|
|
+ *
|
|
+ * @return UUID of summoner
|
|
+ */
|
|
+ @org.jetbrains.annotations.Nullable java.util.UUID getSummoner();
|
|
+
|
|
+ /**
|
|
+ * Set the player that summoned this snowman
|
|
+ *
|
|
+ * @param summoner UUID of summoner
|
|
+ */
|
|
+ void setSummoner(@org.jetbrains.annotations.Nullable java.util.UUID summoner);
|
|
+ // Purpur end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java
|
|
index 8c95cd6933f11076de936854f379e6fc8600b525..86907637ed0a53d4967606dbba3ea20320b528f8 100644
|
|
--- a/src/main/java/org/bukkit/entity/Wither.java
|
|
+++ b/src/main/java/org/bukkit/entity/Wither.java
|
|
@@ -36,4 +36,20 @@ public interface Wither extends Monster, Boss, RangedEntity { // Paper
|
|
*/
|
|
void setCanTravelThroughPortals(boolean value);
|
|
// Paper end
|
|
+
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * Get the player that summoned this wither
|
|
+ *
|
|
+ * @return UUID of summoner
|
|
+ */
|
|
+ @org.jetbrains.annotations.Nullable java.util.UUID getSummoner();
|
|
+
|
|
+ /**
|
|
+ * Set the player that summoned this wither
|
|
+ *
|
|
+ * @param summoner UUID of summoner
|
|
+ */
|
|
+ void setSummoner(@org.jetbrains.annotations.Nullable java.util.UUID summoner);
|
|
+ // Purpur end
|
|
}
|