Paper/nms-patches/EntitySlime.patch

50 Zeilen
2.0 KiB
Diff

2015-02-26 23:41:06 +01:00
--- /home/matt/mc-dev-private//net/minecraft/server/EntitySlime.java 2015-02-26 22:40:22.687608138 +0000
+++ src/main/java/net/minecraft/server/EntitySlime.java 2015-02-26 22:40:22.691608138 +0000
@@ -1,5 +1,9 @@
package net.minecraft.server;
+// CraftBukkit start
+import org.bukkit.event.entity.SlimeSplitEvent;
+// CraftBukkit end
+
public class EntitySlime extends EntityInsentient implements IMonster {
public float a;
2015-02-26 23:41:06 +01:00
@@ -23,7 +27,7 @@
this.datawatcher.a(16, Byte.valueOf((byte) 1));
}
2015-02-26 23:41:06 +01:00
- protected void setSize(int i) {
+ public void setSize(int i) { // CraftBukkit - public
this.datawatcher.watch(16, Byte.valueOf((byte) i));
this.setSize(0.51000005F * (float) i, 0.51000005F * (float) i);
this.setPosition(this.locX, this.locY, this.locZ);
@@ -133,6 +137,18 @@
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;
@@ -148,7 +164,7 @@
entityslime.setSize(i / 2);
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
}
}