Paper/nms-patches/EntitySlime.patch

50 Zeilen
1.8 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntitySlime.java
+++ b/net/minecraft/server/EntitySlime.java
2016-05-10 13:47:39 +02:00
@@ -1,6 +1,9 @@
package net.minecraft.server;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.event.entity.SlimeSplitEvent;
+// CraftBukkit end
2016-05-10 13:47:39 +02:00
public class EntitySlime extends EntityInsentient implements IMonster {
2018-07-15 02:00:00 +02:00
@@ -134,7 +137,7 @@
}
public EntityTypes<? extends EntitySlime> P() {
- return super.P();
+ return (EntityTypes<? extends EntitySlime>) super.P(); // CraftBukkit - decompile error
}
public void die() {
2016-11-17 02:41:03 +01:00
@@ -143,6 +146,18 @@
2015-02-26 23:41:06 +01:00
if (!this.world.isClientSide && i > 1 && this.getHealth() <= 0.0F) {
int j = 2 + this.random.nextInt(3);
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
+ SlimeSplitEvent event = new SlimeSplitEvent((org.bukkit.entity.Slime) this.getBukkitEntity(), j);
+ this.world.getServer().getPluginManager().callEvent(event);
+
+ if (!event.isCancelled() && event.getCount() > 0) {
+ j = event.getCount();
+ } else {
+ super.die();
+ return;
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
for (int k = 0; k < j; ++k) {
float f = ((float) (k % 2) - 0.5F) * (float) i / 4.0F;
2015-02-26 23:41:06 +01:00
float f1 = ((float) (k / 2) - 0.5F) * (float) i / 4.0F;
2016-11-17 02:41:03 +01:00
@@ -158,7 +173,7 @@
2016-11-17 02:41:03 +01:00
entityslime.setSize(i / 2, true);
entityslime.setPositionRotation(this.locX + (double) f, this.locY + 0.5D, this.locZ + (double) f1, this.random.nextFloat() * 360.0F, 0.0F);
- this.world.addEntity(entityslime);
+ this.world.addEntity(entityslime, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SLIME_SPLIT); // CraftBukkit - SpawnReason
}
}