1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-15 11:15:41 +01:00
PaperMC/nms-patches/EntitySnowman.patch

43 lines
1.9 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntitySnowman.java
+++ b/net/minecraft/server/EntitySnowman.java
@@ -1,6 +1,9 @@
package net.minecraft.server;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+// CraftBukkit end
2016-05-10 13:47:39 +02:00
2020-06-25 02:00:00 +02:00
public class EntitySnowman extends EntityGolem implements IShearable, IRangedEntity {
2020-06-25 02:00:00 +02:00
@@ -60,7 +63,7 @@
int k = MathHelper.floor(this.locZ());
2018-12-25 22:00:00 +01:00
if (this.world.getBiome(new BlockPosition(i, 0, k)).getAdjustedTemperature(new BlockPosition(i, j, k)) > 1.0F) {
- this.damageEntity(DamageSource.BURN, 1.0F);
+ this.damageEntity(CraftEventFactory.MELTING, 1.0F); // CraftBukkit - DamageSource.BURN -> CraftEventFactory.MELTING
}
2019-06-21 12:00:00 +02:00
if (!this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING)) {
2020-06-25 02:00:00 +02:00
@@ -76,7 +79,7 @@
2015-02-26 23:41:06 +01:00
BlockPosition blockposition = new BlockPosition(i, j, k);
2018-12-25 22:00:00 +01:00
if (this.world.getType(blockposition).isAir() && this.world.getBiome(blockposition).getAdjustedTemperature(blockposition) < 0.8F && iblockdata.canPlace(this.world, blockposition)) {
2018-07-15 02:00:00 +02:00
- this.world.setTypeUpdate(blockposition, iblockdata);
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this.world, blockposition, iblockdata, this); // CraftBukkit
}
}
}
2020-06-25 02:00:00 +02:00
@@ -107,6 +110,11 @@
ItemStack itemstack = entityhuman.b(enumhand);
2020-06-25 02:00:00 +02:00
if (itemstack.getItem() == Items.SHEARS && this.canShear()) {
+ // CraftBukkit start
+ if (!CraftEventFactory.handlePlayerShearEntityEvent(entityhuman, this, itemstack, enumhand)) {
+ return EnumInteractionResult.PASS;
+ }
+ // CraftBukkit end
this.shear(SoundCategory.PLAYERS);
2019-12-10 23:00:00 +01:00
if (!this.world.isClientSide) {
itemstack.damage(1, entityhuman, (entityhuman1) -> {