geforkt von Mirrors/Paper
48 Zeilen
2.1 KiB
Diff
48 Zeilen
2.1 KiB
Diff
--- a/net/minecraft/server/EntitySnowman.java
|
|
+++ b/net/minecraft/server/EntitySnowman.java
|
|
@@ -1,6 +1,10 @@
|
|
package net.minecraft.server;
|
|
|
|
import javax.annotation.Nullable;
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.event.player.PlayerShearEntityEvent;
|
|
+// CraftBukkit end
|
|
|
|
public class EntitySnowman extends EntityGolem implements IRangedEntity {
|
|
|
|
@@ -59,7 +63,7 @@
|
|
}
|
|
|
|
if (this.world.getBiome(new BlockPosition(i, 0, k)).a(new BlockPosition(i, j, k)) > 1.0F) {
|
|
- this.damageEntity(DamageSource.BURN, 1.0F);
|
|
+ this.damageEntity(CraftEventFactory.MELTING, 1.0F); // CraftBukkit - DamageSource.BURN -> CraftEventFactory.MELTING
|
|
}
|
|
|
|
if (!this.world.getGameRules().getBoolean("mobGriefing")) {
|
|
@@ -73,7 +77,7 @@
|
|
BlockPosition blockposition = new BlockPosition(i, j, k);
|
|
|
|
if (this.world.getType(blockposition).getMaterial() == Material.AIR && this.world.getBiome(blockposition).a(blockposition) < 0.8F && Blocks.SNOW_LAYER.canPlace(this.world, blockposition)) {
|
|
- this.world.setTypeUpdate(blockposition, Blocks.SNOW_LAYER.getBlockData());
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this.world, blockposition, Blocks.SNOW_LAYER.getBlockData(), this); // CraftBukkit
|
|
}
|
|
}
|
|
}
|
|
@@ -106,6 +110,15 @@
|
|
ItemStack itemstack = entityhuman.b(enumhand);
|
|
|
|
if (itemstack.getItem() == Items.SHEARS && this.hasPumpkin() && !this.world.isClientSide) {
|
|
+ // CraftBukkit start
|
|
+ PlayerShearEntityEvent event = new PlayerShearEntityEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), this.getBukkitEntity());
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
this.setHasPumpkin(false);
|
|
itemstack.damage(1, entityhuman);
|
|
}
|