3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-30 01:50:08 +01:00
Paper/nms-patches/ItemSnowball.patch

35 Zeilen
1.7 KiB
Diff

--- a/net/minecraft/server/ItemSnowball.java
+++ b/net/minecraft/server/ItemSnowball.java
2019-04-23 04:00:00 +02:00
@@ -10,18 +10,30 @@
2016-11-17 02:41:03 +01:00
public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
ItemStack itemstack = entityhuman.b(enumhand);
+ // CraftBukkit start - moved down
2016-11-17 02:41:03 +01:00
+ /*
if (!entityhuman.abilities.canInstantlyBuild) {
itemstack.subtract(1);
}
2019-07-20 01:00:00 +02:00
world.playSound((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemSnowball.i.nextFloat() * 0.4F + 0.8F));
2016-03-30 21:50:59 +02:00
+ */
if (!world.isClientSide) {
EntitySnowball entitysnowball = new EntitySnowball(world, entityhuman);
2019-04-23 04:00:00 +02:00
entitysnowball.setItem(itemstack);
entitysnowball.a(entityhuman, entityhuman.pitch, entityhuman.yaw, 0.0F, 1.5F, 1.0F);
- world.addEntity(entitysnowball);
+ if (world.addEntity(entitysnowball)) {
+ if (!entityhuman.abilities.canInstantlyBuild) {
2016-11-17 02:41:03 +01:00
+ itemstack.subtract(1);
+ }
+
2019-07-20 01:00:00 +02:00
+ world.playSound((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemSnowball.i.nextFloat() * 0.4F + 0.8F));
+ } else if (entityhuman instanceof EntityPlayer) {
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
+ }
}
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
entityhuman.b(StatisticList.ITEM_USED.b(this));
2018-12-25 22:00:00 +01:00
return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, itemstack);