craftbukkit/nms-patches/net/minecraft/world/entity/monster/EntitySlime.patch

83 lines
3.4 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/entity/monster/EntitySlime.java
+++ b/net/minecraft/world/entity/monster/EntitySlime.java
2024-06-14 01:05:00 +10:00
@@ -45,6 +45,15 @@
2024-04-24 01:15:00 +10:00
import net.minecraft.world.level.levelgen.SeededRandom;
2021-03-16 09:00:00 +11:00
import net.minecraft.world.phys.Vec3D;
2021-03-09 08:47:33 +11:00
+// CraftBukkit start
+import java.util.ArrayList;
+import java.util.List;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityRemoveEvent;
+import org.bukkit.event.entity.EntityTransformEvent;
+import org.bukkit.event.entity.SlimeSplitEvent;
+// CraftBukkit end
2021-03-09 08:47:33 +11:00
+
public class EntitySlime extends EntityInsentient implements IMonster {
2021-11-22 09:00:00 +11:00
private static final DataWatcherObject<Integer> ID_SIZE = DataWatcher.defineId(EntitySlime.class, DataWatcherRegistry.INT);
2024-06-14 01:05:00 +10:00
@@ -195,11 +204,18 @@
2018-07-15 10:00:00 +10:00
2019-04-23 12:00:00 +10:00
@Override
2021-11-22 09:00:00 +11:00
public EntityTypes<? extends EntitySlime> getType() {
- return super.getType();
+ return (EntityTypes<? extends EntitySlime>) super.getType(); // CraftBukkit - decompile error
2018-07-15 10:00:00 +10:00
}
2019-04-23 12:00:00 +10:00
@Override
public void remove(Entity.RemovalReason entity_removalreason) {
+ // CraftBukkit start - add Bukkit remove cause
+ this.remove(entity_removalreason, null);
+ }
+
+ @Override
+ public void remove(Entity.RemovalReason entity_removalreason, EntityRemoveEvent.Cause cause) {
+ // CraftBukkit end
int i = this.getSize();
if (!this.level().isClientSide && i > 1 && this.isDeadOrDying()) {
2024-06-14 01:05:00 +10:00
@@ -210,6 +226,19 @@
2020-06-25 10:00:00 +10:00
int j = i / 2;
int k = 2 + this.random.nextInt(3);
2015-02-26 22:41:06 +00:00
+ // CraftBukkit start
2020-06-25 10:00:00 +10:00
+ SlimeSplitEvent event = new SlimeSplitEvent((org.bukkit.entity.Slime) this.getBukkitEntity(), k);
2023-06-08 01:30:00 +10:00
+ this.level().getCraftServer().getPluginManager().callEvent(event);
+
+ if (!event.isCancelled() && event.getCount() > 0) {
2020-06-25 10:00:00 +10:00
+ k = event.getCount();
+ } else {
+ super.remove(entity_removalreason, cause); // CraftBukkit - add Bukkit remove cause
+ return;
+ }
+ List<EntityLiving> slimes = new ArrayList<>(j);
+ // CraftBukkit end
2015-02-26 22:41:06 +00:00
+
2020-06-25 10:00:00 +10:00
for (int l = 0; l < k; ++l) {
2024-04-24 01:15:00 +10:00
float f2 = ((float) (l % 2) - 0.5F) * f1;
float f3 = ((float) (l / 2) - 0.5F) * f1;
2024-06-14 01:05:00 +10:00
@@ -225,12 +254,21 @@
2022-12-08 03:00:00 +11:00
entityslime.setInvulnerable(this.isInvulnerable());
entityslime.setSize(j, true);
2024-04-24 01:15:00 +10:00
entityslime.moveTo(this.getX() + (double) f2, this.getY() + 0.5D, this.getZ() + (double) f3, this.random.nextFloat() * 360.0F, 0.0F);
2023-06-08 01:30:00 +10:00
- this.level().addFreshEntity(entityslime);
2022-12-08 03:00:00 +11:00
+ slimes.add(entityslime); // CraftBukkit
}
}
+ // CraftBukkit start
+ if (CraftEventFactory.callEntityTransformEvent(this, slimes, EntityTransformEvent.TransformReason.SPLIT).isCancelled()) {
+ super.remove(entity_removalreason, cause); // CraftBukkit - add Bukkit remove cause
+ return;
+ }
+ for (EntityLiving living : slimes) {
2023-06-08 01:30:00 +10:00
+ this.level().addFreshEntity(living, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SLIME_SPLIT); // CraftBukkit - SpawnReason
2022-12-08 03:00:00 +11:00
+ }
+ // CraftBukkit end
}
- super.remove(entity_removalreason);
+ super.remove(entity_removalreason, cause); // CraftBukkit - add Bukkit remove cause
}
@Override