Remove Moonrise utils to MCUtils, remove duplicated/unused utils

1 files changed, 34 insertions, 0 deletions

diff --git a/patches/server/0209-Vex-get-setSummoner-API.patch b/patches/server/0209-Vex-get-setSummoner-API.patch
new file mode 100644
index 0000000000..9c014ff1fc
--- /dev/null
+++ b/patches/server/0209-Vex-get-setSummoner-API.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Wed, 4 Jul 2018 15:30:22 -0400
+Subject: [PATCH] Vex#get/setSummoner API
+
+Get's the NPC that summoned this Vex and
+Allow setting the vex's summoner
+
+Co-authored-by: BillyGalbreath <[email protected]>
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
+index f816e30e36042438fa5ead72ce25e7b5bce232bb..1cfbe9c476f4a254edf3edf4b70696bbaba78558 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
+@@ -18,6 +18,19 @@ public class CraftVex extends CraftMonster implements Vex {
+         return (net.minecraft.world.entity.monster.Vex) super.getHandle();
+     }
+ 
++    // Paper start
++    @Override
++    public org.bukkit.entity.Mob getSummoner() {
++        net.minecraft.world.entity.Mob owner = getHandle().getOwner();
++        return owner != null ? (org.bukkit.entity.Mob) owner.getBukkitEntity() : null;
++    }
++
++    @Override
++    public void setSummoner(org.bukkit.entity.Mob summoner) {
++        getHandle().setOwner(summoner == null ? null : ((CraftMob) summoner).getHandle());
++    }
++    // Paper end
++
+     @Override
+     public String toString() {
+         return "CraftVex";