PaperMC/patches/server/0247-Add-PhantomPreSpawnEvent.patch

97 lines
5 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 25 Aug 2018 19:56:51 -0500
Subject: [PATCH] Add PhantomPreSpawnEvent
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index c436476b3ec442b40a7ff122e6d3947a47ae163b..84400bb44d5deb7c79295a83c4c3c6aac88f3175 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -171,6 +171,11 @@ public class Phantom extends FlyingMob implements Enemy {
2021-06-11 14:02:28 +02:00
}
2021-06-13 01:45:00 +02:00
this.setPhantomSize(nbt.getInt("Size"));
2021-06-11 14:02:28 +02:00
+ // Paper start
2021-06-13 01:45:00 +02:00
+ if (nbt.hasUUID("Paper.SpawningEntity")) {
+ this.spawningEntity = nbt.getUUID("Paper.SpawningEntity");
2021-06-11 14:02:28 +02:00
+ }
+ // Paper end
}
@Override
@@ -180,6 +185,11 @@ public class Phantom extends FlyingMob implements Enemy {
2021-06-13 01:45:00 +02:00
nbt.putInt("AY", this.anchorPoint.getY());
nbt.putInt("AZ", this.anchorPoint.getZ());
nbt.putInt("Size", this.getPhantomSize());
2021-06-11 14:02:28 +02:00
+ // Paper start
+ if (this.spawningEntity != null) {
2021-06-17 23:39:36 +02:00
+ nbt.putUUID("Paper.SpawningEntity", this.spawningEntity);
2021-06-11 14:02:28 +02:00
+ }
+ // Paper end
}
@Override
@@ -231,6 +241,14 @@ public class Phantom extends FlyingMob implements Enemy {
2021-06-11 14:02:28 +02:00
return entitysize.scale(f);
}
+ // Paper start
+ java.util.UUID spawningEntity;
+
+ public java.util.UUID getSpawningEntity() {
+ return spawningEntity;
+ }
+ public void setSpawningEntity(java.util.UUID entity) { this.spawningEntity = entity; }
+ // Paper end
2021-06-13 01:45:00 +02:00
private static enum AttackPhase {
2021-06-11 14:02:28 +02:00
2021-06-13 01:45:00 +02:00
CIRCLE, SWOOP;
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
2022-06-07 23:45:11 +02:00
index 573490a7c95746c3d372d258b2e592241258f6cf..e9d25aef08103ccdbc6a35c3ab67c1d921e9f45d 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
+++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
2022-06-07 23:45:11 +02:00
@@ -3,6 +3,7 @@ package net.minecraft.world.level.levelgen;
import java.util.Iterator;
2021-06-11 14:02:28 +02:00
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
+import net.minecraft.server.MCUtil;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.stats.ServerStatsCounter;
@@ -71,8 +72,17 @@ public class PhantomSpawner implements CustomSpawner {
2022-06-07 23:45:11 +02:00
int k = 1 + randomsource.nextInt(difficultydamagescaler.getDifficulty().getId() + 1);
2021-06-11 14:02:28 +02:00
for (int l = 0; l < k; ++l) {
+ // Paper start
+ com.destroystokyo.paper.event.entity.PhantomPreSpawnEvent event = new com.destroystokyo.paper.event.entity.PhantomPreSpawnEvent(MCUtil.toLocation(world, blockposition1), ((ServerPlayer) entityhuman).getBukkitEntity(), org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL);
+ if (!event.callEvent()) {
+ if (event.shouldAbortSpawn()) {
+ break;
+ }
+ continue;
+ }
+ // Paper end
Phantom entityphantom = (Phantom) EntityType.PHANTOM.create(world);
2021-06-11 14:02:28 +02:00
-
+ entityphantom.setSpawningEntity(entityhuman.getUUID()); // Paper
entityphantom.moveTo(blockposition1, 0.0F, 0.0F);
groupdataentity = entityphantom.finalizeSpawn(world, difficultydamagescaler, MobSpawnType.NATURAL, groupdataentity, (CompoundTag) null);
world.addFreshEntityWithPassengers(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
2021-06-13 01:45:00 +02:00
index f77b83bee6eb739220b55793a0807f0267cfc8a9..c9dab70b0b284fe1c1daafd3c1f5bd08b14fa35d 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
2021-06-13 01:45:00 +02:00
@@ -34,4 +34,11 @@ public class CraftPhantom extends CraftFlying implements Phantom {
2021-06-11 14:02:28 +02:00
public EntityType getType() {
return EntityType.PHANTOM;
}
+
+ // Paper start
2021-06-13 01:45:00 +02:00
+ @Override
2021-06-11 14:02:28 +02:00
+ public java.util.UUID getSpawningEntity() {
+ return getHandle().getSpawningEntity();
+ }
+ // Paper end
}