Paper/nms-patches/EntityMushroomCow.patch

46 lines
2.0 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityMushroomCow.java
+++ b/net/minecraft/server/EntityMushroomCow.java
@@ -3,6 +3,10 @@
2019-06-21 12:00:00 +02:00
import java.util.Random;
2019-04-23 04:00:00 +02:00
import java.util.UUID;
import org.apache.commons.lang3.tuple.Pair;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityTransformEvent;
+// CraftBukkit end
2019-04-23 04:00:00 +02:00
public class EntityMushroomCow extends EntityCow {
@@ -81,9 +85,14 @@
2019-04-23 04:00:00 +02:00
int i;
2019-12-10 23:00:00 +01:00
if (itemstack.getItem() == Items.SHEARS && !this.isBaby()) {
+ // CraftBukkit start
+ if (!CraftEventFactory.handlePlayerShearEntityEvent(entityhuman, this, itemstack, enumhand)) {
+ return false;
+ }
+ // CraftBukkit end
2019-12-10 23:00:00 +01:00
this.world.addParticle(Particles.EXPLOSION, this.locX(), this.e(0.5D), this.locZ(), 0.0D, 0.0D, 0.0D);
2019-04-23 04:00:00 +02:00
if (!this.world.isClientSide) {
- this.die();
+ // this.die(); // CraftBukkit - moved down
EntityCow entitycow = (EntityCow) EntityTypes.COW.a(this.world);
2019-12-10 23:00:00 +01:00
entitycow.setPositionRotation(this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch);
@@ -99,7 +108,14 @@
2019-04-23 04:00:00 +02:00
}
2019-12-10 23:00:00 +01:00
entitycow.setInvulnerable(this.isInvulnerable());
2019-04-23 04:00:00 +02:00
- this.world.addEntity(entitycow);
+ // CraftBukkit start
+ if (CraftEventFactory.callEntityTransformEvent(this, entitycow, EntityTransformEvent.TransformReason.SHEARED).isCancelled()) {
+ return false;
+ }
+ this.world.addEntity(entitycow, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SHEARED);
+
+ this.die(); // CraftBukkit - from above
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
for (i = 0; i < 5; ++i) {
2019-12-10 23:00:00 +01:00
this.world.addEntity(new EntityItem(this.world, this.locX(), this.e(1.0D), this.locZ(), new ItemStack(this.getVariant().d.getBlock())));