66 Zeilen
3.7 KiB
Diff
66 Zeilen
3.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||
|
|
Date: Sun, 18 Jun 2017 18:17:05 -0500
|
||
|
|
Subject: [PATCH] Entity#fromMobSpawner()
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
index dcaf5c107bb77b63333f924a33961f9e5cad7082..43039c14e087259e3ce4b5091b887759b66fe52d 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -268,6 +268,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
|
||
|
|
public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
|
||
|
|
public final boolean defaultActivationState;
|
||
|
|
public long activatedTick = Integer.MIN_VALUE;
|
||
|
|
+ public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
|
||
|
|
protected int numCollisions = 0; // Paper
|
||
|
|
public void inactiveTick() { }
|
||
|
|
// Spigot end
|
||
|
|
@@ -1666,6 +1667,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
|
||
|
|
nbttagcompound.setUUID("Paper.OriginWorld", origin.getWorld().getUID());
|
||
|
|
nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
|
||
|
|
}
|
||
|
|
+ // Save entity's from mob spawner status
|
||
|
|
+ if (spawnedViaMobSpawner) {
|
||
|
|
+ nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
return nbttagcompound;
|
||
|
|
} catch (Throwable throwable) {
|
||
|
|
@@ -1798,6 +1803,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
|
||
|
|
}
|
||
|
|
origin = new org.bukkit.Location(originWorld, originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2));
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
|
||
|
|
// Paper end
|
||
|
|
|
||
|
|
} catch (Throwable throwable) {
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java b/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
|
||
|
|
index 76c98d576d3e567ec4482b30219f5a9107cb9703..43fcc001bb9815b352cb74af10290b2a4ccaa540 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
|
||
|
|
@@ -160,6 +160,7 @@ public abstract class MobSpawnerAbstract {
|
||
|
|
}
|
||
|
|
// Spigot End
|
||
|
|
}
|
||
|
|
+ entity.spawnedViaMobSpawner = true; // Paper
|
||
|
|
// Spigot Start
|
||
|
|
if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
|
||
|
|
Entity vehicle = entity.getVehicle();
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||
|
|
index a58626b1a0160983a738a45c8a1d411eb347e6a2..4c2a35fb33da19a15a220dc5e0c9fa3233d657fb 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||
|
|
@@ -1100,5 +1100,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||
|
|
Location origin = getHandle().origin;
|
||
|
|
return origin == null ? null : origin.clone();
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ @Override
|
||
|
|
+ public boolean fromMobSpawner() {
|
||
|
|
+ return getHandle().spawnedViaMobSpawner;
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
}
|