Paper/nms-patches/EntitySlime.patch

65 lines
2.4 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntitySlime.java
+++ b/net/minecraft/server/EntitySlime.java
2020-08-11 23:00:00 +02:00
@@ -5,6 +5,13 @@
import java.util.Optional;
2019-06-21 12:00:00 +02:00
import java.util.Random;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.ArrayList;
+import java.util.List;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityTransformEvent;
+import org.bukkit.event.entity.SlimeSplitEvent;
+// CraftBukkit end
2016-05-10 13:47:39 +02:00
public class EntitySlime extends EntityInsentient implements IMonster {
2020-08-11 23:00:00 +02:00
@@ -149,7 +156,7 @@
2018-07-15 02:00:00 +02:00
2019-04-23 04:00:00 +02:00
@Override
public EntityTypes<? extends EntitySlime> getEntityType() {
- return super.getEntityType();
+ return (EntityTypes<? extends EntitySlime>) super.getEntityType(); // CraftBukkit - decompile error
2018-07-15 02:00:00 +02:00
}
2019-04-23 04:00:00 +02:00
@Override
2020-08-11 23:00:00 +02:00
@@ -163,6 +170,19 @@
2020-06-25 02:00:00 +02:00
int j = i / 2;
int k = 2 + this.random.nextInt(3);
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
2020-06-25 02:00:00 +02:00
+ SlimeSplitEvent event = new SlimeSplitEvent((org.bukkit.entity.Slime) this.getBukkitEntity(), k);
+ this.world.getServer().getPluginManager().callEvent(event);
+
+ if (!event.isCancelled() && event.getCount() > 0) {
2020-06-25 02:00:00 +02:00
+ k = event.getCount();
+ } else {
+ super.die();
+ return;
+ }
+ List<EntityLiving> slimes = new ArrayList<>(j);
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2020-06-25 02:00:00 +02:00
for (int l = 0; l < k; ++l) {
float f1 = ((float) (l % 2) - 0.5F) * f;
float f2 = ((float) (l / 2) - 0.5F) * f;
2020-08-11 23:00:00 +02:00
@@ -177,8 +197,17 @@
2019-12-10 23:00:00 +01:00
entityslime.setInvulnerable(this.isInvulnerable());
2020-06-25 02:00:00 +02:00
entityslime.setSize(j, true);
entityslime.setPositionRotation(this.locX() + (double) f1, this.locY() + 0.5D, this.locZ() + (double) f2, this.random.nextFloat() * 360.0F, 0.0F);
- this.world.addEntity(entityslime);
+ slimes.add(entityslime); // CraftBukkit
+ }
+
+ // CraftBukkit start
+ if (CraftEventFactory.callEntityTransformEvent(this, slimes, EntityTransformEvent.TransformReason.SPLIT).isCancelled()) {
+ return;
+ }
+ for (EntityLiving living : slimes) {
+ this.world.addEntity(living, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SLIME_SPLIT); // CraftBukkit - SpawnReason
}
+ // CraftBukkit end
}
super.die();