mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-04 01:17:56 +02:00
c97ce029e9
PaperMC believes that 1.16.2 is now ready for general release as we fixed the main issue plagueing the 1.16.x release, the MapLike data conversion issues. Until now, it was not safe for a server to convert a world to 1.16.2 without data conversion issues around villages and potentially other things. If you did, those MapLike errors meant something went wrong. This is now resolved. Big thanks to all those that helped, notably @BillyGalbreath and @Proximyst who did large parts of the update process with me. Please as always, backup your worlds and test before updating to 1.16.2! If you update to 1.16.2, there is no going back to an older build than this. --------------------------------- Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com> Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com> Co-authored-by: krolik-exe <69214078+krolik-exe@users.noreply.github.com> Co-authored-by: BillyGalbreath <BillyGalbreath@users.noreply.github.com> Co-authored-by: stonar96 <minecraft.stonar96@gmail.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Jason <jasonpenilla2@me.com> Co-authored-by: kashike <kashike@vq.lc> Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com> Co-authored-by: KennyTV <kennytv@t-online.de> Co-authored-by: commandblockguy <commandblockguy1@gmail.com> Co-authored-by: DigitalRegent <misterwener@gmail.com> Co-authored-by: ishland <ishlandmc@yeah.net>
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 4 Jul 2018 15:30:22 -0400
|
|
Subject: [PATCH] Vex#getSummoner API
|
|
|
|
Get's the NPC that summoned this Vex
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
|
|
index d69beb58d805d442e346725020fe47582841000f..a8e9b1e83969f4e49465fc5e8b5fb8a5efe5f81d 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
|
@@ -89,6 +89,7 @@ public class EntityVex extends EntityMonster {
|
|
|
|
}
|
|
|
|
+ public EntityInsentient getOwner() { return eK(); } // Paper - OBFHELPER
|
|
public EntityInsentient eK() {
|
|
return this.c;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
|
index 737a37b6fe9cc4f6a93f7bae7e4f8326024929cc..169c951ec30fc5b78eb4ba29352ba009b7fa5efd 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
|
@@ -1,8 +1,10 @@
|
|
package org.bukkit.craftbukkit.entity;
|
|
|
|
+import net.minecraft.server.EntityInsentient;
|
|
import net.minecraft.server.EntityVex;
|
|
import org.bukkit.craftbukkit.CraftServer;
|
|
import org.bukkit.entity.EntityType;
|
|
+import org.bukkit.entity.Mob;
|
|
import org.bukkit.entity.Vex;
|
|
|
|
public class CraftVex extends CraftMonster implements Vex {
|
|
@@ -16,6 +18,13 @@ public class CraftVex extends CraftMonster implements Vex {
|
|
return (EntityVex) super.getHandle();
|
|
}
|
|
|
|
+ // Paper start
|
|
+ public Mob getSummoner() {
|
|
+ EntityInsentient owner = getHandle().getOwner();
|
|
+ return owner != null ? (Mob) owner.getBukkitEntity() : null;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public String toString() {
|
|
return "CraftVex";
|