mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 03:52:45 +01:00
b97cc9b99f
By: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
57 lines
2.7 KiB
Diff
57 lines
2.7 KiB
Diff
--- a/net/minecraft/world/entity/animal/EntitySnowman.java
|
|
+++ b/net/minecraft/world/entity/animal/EntitySnowman.java
|
|
@@ -41,6 +41,10 @@
|
|
import net.minecraft.world.level.gameevent.GameEvent;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntitySnowman extends EntityGolem implements IShearable, IRangedEntity {
|
|
|
|
private static final DataWatcherObject<Byte> DATA_PUMPKIN_ID = DataWatcher.defineId(EntitySnowman.class, DataWatcherRegistry.BYTE);
|
|
@@ -97,7 +101,7 @@
|
|
super.aiStep();
|
|
if (!this.level().isClientSide) {
|
|
if (this.level().getBiome(this.blockPosition()).is(BiomeTags.SNOW_GOLEM_MELTS)) {
|
|
- this.hurt(this.damageSources().onFire(), 1.0F);
|
|
+ this.hurt(this.damageSources().melting, 1.0F); // CraftBukkit - DamageSource.BURN -> CraftEventFactory.MELTING
|
|
}
|
|
|
|
if (!this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
|
|
@@ -113,7 +117,11 @@
|
|
BlockPosition blockposition = new BlockPosition(j, k, l);
|
|
|
|
if (this.level().getBlockState(blockposition).isAir() && iblockdata.canSurvive(this.level(), blockposition)) {
|
|
- this.level().setBlockAndUpdate(blockposition, iblockdata);
|
|
+ // CraftBukkit start
|
|
+ if (!CraftEventFactory.handleBlockFormEvent(this.level(), blockposition, iblockdata, this)) {
|
|
+ continue;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.level().gameEvent(GameEvent.BLOCK_PLACE, blockposition, GameEvent.a.of(this, iblockdata));
|
|
}
|
|
}
|
|
@@ -145,6 +153,11 @@
|
|
ItemStack itemstack = entityhuman.getItemInHand(enumhand);
|
|
|
|
if (itemstack.is(Items.SHEARS) && this.readyForShearing()) {
|
|
+ // CraftBukkit start
|
|
+ if (!CraftEventFactory.handlePlayerShearEntityEvent(entityhuman, this, itemstack, enumhand)) {
|
|
+ return EnumInteractionResult.PASS;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.shear(SoundCategory.PLAYERS);
|
|
this.gameEvent(GameEvent.SHEAR, entityhuman);
|
|
if (!this.level().isClientSide) {
|
|
@@ -164,7 +177,9 @@
|
|
this.level().playSound((EntityHuman) null, (Entity) this, SoundEffects.SNOW_GOLEM_SHEAR, soundcategory, 1.0F, 1.0F);
|
|
if (!this.level().isClientSide()) {
|
|
this.setPumpkin(false);
|
|
+ this.forceDrops = true; // CraftBukkit
|
|
this.spawnAtLocation(new ItemStack(Items.CARVED_PUMPKIN), 1.7F);
|
|
+ this.forceDrops = false; // CraftBukkit
|
|
}
|
|
|
|
}
|