2019-01-01 04:15:55 +01:00
|
|
|
From ef42b2e74c1447362e02453981a5bfe7c9c7d461 Mon Sep 17 00:00:00 2001
|
2018-08-17 23:55:40 +02:00
|
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Sat, 21 Jul 2018 03:11:03 -0500
|
|
|
|
Subject: [PATCH] PlayerLaunchProjectileEvent
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
|
2019-01-01 04:15:55 +01:00
|
|
|
index 18e8825c4..5f3926d83 100644
|
2018-08-17 23:55:40 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemEgg.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemEgg.java
|
2019-01-01 04:15:55 +01:00
|
|
|
@@ -9,16 +9,34 @@ public class ItemEgg extends Item {
|
2018-08-17 23:55:40 +02:00
|
|
|
public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
|
|
|
|
ItemStack itemstack = entityhuman.b(enumhand);
|
2018-09-01 00:56:57 +02:00
|
|
|
|
2019-01-01 04:15:55 +01:00
|
|
|
+ /* // Paper start - moved down
|
|
|
|
if (!entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
itemstack.subtract(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_EGG_THROW, SoundCategory.PLAYERS, 0.5F, 0.4F / (ItemEgg.i.nextFloat() * 0.4F + 0.8F));
|
|
|
|
+ */ // Paper end
|
2018-08-17 23:55:40 +02:00
|
|
|
if (!world.isClientSide) {
|
|
|
|
EntityEgg entityegg = new EntityEgg(world, entityhuman);
|
2019-01-01 04:15:55 +01:00
|
|
|
|
2018-08-17 23:55:40 +02:00
|
|
|
entityegg.a(entityhuman, entityhuman.pitch, entityhuman.yaw, 0.0F, 1.5F, 1.0F);
|
|
|
|
- world.addEntity(entityegg);
|
|
|
|
+ // Paper start
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityegg.getBukkitEntity());
|
|
|
|
+ if (event.callEvent() && world.addEntity(entityegg)) {
|
|
|
|
+ if (event.shouldConsume() && !entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
+ itemstack.subtract(1);
|
|
|
|
+ } else if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+
|
2018-08-26 20:11:49 +02:00
|
|
|
+ world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_EGG_THROW, SoundCategory.PLAYERS, 0.5F, 0.4F / (Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
|
2018-08-17 23:55:40 +02:00
|
|
|
+ } else {
|
|
|
|
+ if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
2019-01-01 04:15:55 +01:00
|
|
|
index 3672996c2..719210da1 100644
|
2018-08-17 23:55:40 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
|
|
|
@@ -14,7 +14,19 @@ public class ItemEnderPearl extends Item {
|
|
|
|
EntityEnderPearl entityenderpearl = new EntityEnderPearl(world, entityhuman);
|
|
|
|
|
|
|
|
entityenderpearl.a(entityhuman, entityhuman.pitch, entityhuman.yaw, 0.0F, 1.5F, 1.0F);
|
|
|
|
- if (!world.addEntity(entityenderpearl)) {
|
|
|
|
+ // Paper start
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityenderpearl.getBukkitEntity());
|
|
|
|
+ if (event.callEvent() && world.addEntity(entityenderpearl)) {
|
|
|
|
+ if (event.shouldConsume() && !entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
+ itemstack.subtract(1);
|
|
|
|
+ } else if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+
|
2018-08-26 20:11:49 +02:00
|
|
|
+ world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_ENDER_PEARL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
|
2018-08-17 23:55:40 +02:00
|
|
|
+ entityhuman.getCooldownTracker().a(this, 20);
|
|
|
|
+ } else {
|
|
|
|
+ // Paper end
|
|
|
|
if (entityhuman instanceof EntityPlayer) {
|
|
|
|
((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
}
|
|
|
|
@@ -22,13 +34,15 @@ public class ItemEnderPearl extends Item {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (!entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
- itemstack.subtract(1);
|
|
|
|
- }
|
|
|
|
-
|
2018-08-26 20:11:49 +02:00
|
|
|
- world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_ENDER_PEARL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemEnderPearl.i.nextFloat() * 0.4F + 0.8F));
|
2018-08-17 23:55:40 +02:00
|
|
|
- entityhuman.getCooldownTracker().a(this, 20);
|
|
|
|
- // CraftBukkit end
|
|
|
|
+ // Paper start - moved up
|
|
|
|
+ //if (!entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
+ // itemstack.subtract(1);
|
|
|
|
+ //}
|
|
|
|
+ //
|
2018-08-26 20:11:49 +02:00
|
|
|
+ //world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_ENDER_PEARL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemEnderPearl.i.nextFloat() * 0.4F + 0.8F));
|
2018-08-17 23:55:40 +02:00
|
|
|
+ //entityhuman.getCooldownTracker().a(this, 20);
|
|
|
|
+ // // CraftBukkit end
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
2019-01-01 04:15:55 +01:00
|
|
|
return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, itemstack);
|
2018-08-17 23:55:40 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
|
2019-01-01 04:15:55 +01:00
|
|
|
index d26b42f71..23b06169e 100644
|
2018-08-17 23:55:40 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemExpBottle.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
|
2019-01-01 04:15:55 +01:00
|
|
|
@@ -8,17 +8,34 @@ public class ItemExpBottle extends Item {
|
2018-09-01 00:56:57 +02:00
|
|
|
|
2018-08-17 23:55:40 +02:00
|
|
|
public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
|
|
|
|
ItemStack itemstack = entityhuman.b(enumhand);
|
2019-01-01 04:15:55 +01:00
|
|
|
-
|
|
|
|
+ /* // Paper start
|
|
|
|
if (!entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
itemstack.subtract(1);
|
|
|
|
}
|
2018-09-01 00:56:57 +02:00
|
|
|
|
2019-01-01 04:15:55 +01:00
|
|
|
world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_EXPERIENCE_BOTTLE_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemExpBottle.i.nextFloat() * 0.4F + 0.8F));
|
|
|
|
+ */ // Paper end
|
2018-08-17 23:55:40 +02:00
|
|
|
if (!world.isClientSide) {
|
|
|
|
EntityThrownExpBottle entitythrownexpbottle = new EntityThrownExpBottle(world, entityhuman);
|
2019-01-01 04:15:55 +01:00
|
|
|
|
2018-08-17 23:55:40 +02:00
|
|
|
entitythrownexpbottle.a(entityhuman, entityhuman.pitch, entityhuman.yaw, -20.0F, 0.7F, 1.0F);
|
|
|
|
- world.addEntity(entitythrownexpbottle);
|
|
|
|
+ // Paper start
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entitythrownexpbottle.getBukkitEntity());
|
|
|
|
+ if (event.callEvent() && world.addEntity(entitythrownexpbottle)) {
|
|
|
|
+ if (event.shouldConsume() && !entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
+ itemstack.subtract(1);
|
|
|
|
+ } else if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+
|
2018-08-26 20:11:49 +02:00
|
|
|
+ world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_EXPERIENCE_BOTTLE_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
|
2018-08-17 23:55:40 +02:00
|
|
|
+ } else {
|
|
|
|
+ if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
2019-01-01 04:15:55 +01:00
|
|
|
index a74c803e7..8d882b81b 100644
|
2018-08-17 23:55:40 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
2019-01-01 04:15:55 +01:00
|
|
|
@@ -8,14 +8,38 @@ public class ItemLingeringPotion extends ItemPotion {
|
2018-08-17 23:55:40 +02:00
|
|
|
|
|
|
|
public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
|
|
|
|
ItemStack itemstack = entityhuman.b(enumhand);
|
2019-01-01 04:15:55 +01:00
|
|
|
+ /* // Paper start
|
|
|
|
ItemStack itemstack1 = entityhuman.abilities.canInstantlyBuild ? itemstack.cloneItemStack() : itemstack.cloneAndSubtract(1);
|
|
|
|
|
|
|
|
world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_LINGERING_POTION_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemLingeringPotion.i.nextFloat() * 0.4F + 0.8F));
|
|
|
|
+ */ // Paper end
|
2018-08-17 23:55:40 +02:00
|
|
|
if (!world.isClientSide) {
|
|
|
|
+ // Paper start - ensure stack count matches vanilla behavior without modifying original stack yet
|
|
|
|
+ ItemStack itemstack1 = itemstack.cloneItemStack();
|
|
|
|
+ if (!entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
+ itemstack1.setCount(1);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
EntityPotion entitypotion = new EntityPotion(world, entityhuman, itemstack1);
|
2019-01-01 04:15:55 +01:00
|
|
|
|
2018-08-17 23:55:40 +02:00
|
|
|
entitypotion.a(entityhuman, entityhuman.pitch, entityhuman.yaw, -20.0F, 0.5F, 1.0F);
|
|
|
|
- world.addEntity(entitypotion);
|
|
|
|
+ // Paper start
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entitypotion.getBukkitEntity());
|
|
|
|
+ if (event.callEvent() && world.addEntity(entitypotion)) {
|
|
|
|
+ if (event.shouldConsume() && !entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
+ itemstack.subtract(1);
|
|
|
|
+ } else if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+
|
2018-08-26 20:11:49 +02:00
|
|
|
+ world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_LINGERING_POTION_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
|
2018-08-17 23:55:40 +02:00
|
|
|
+ } else {
|
|
|
|
+ if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
|
2019-01-01 04:15:55 +01:00
|
|
|
index d8879e084..95194ccdc 100644
|
2018-08-17 23:55:40 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemSnowball.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemSnowball.java
|
|
|
|
@@ -21,15 +21,23 @@ public class ItemSnowball extends Item {
|
|
|
|
EntitySnowball entitysnowball = new EntitySnowball(world, entityhuman);
|
|
|
|
|
|
|
|
entitysnowball.a(entityhuman, entityhuman.pitch, entityhuman.yaw, 0.0F, 1.5F, 1.0F);
|
|
|
|
- if (world.addEntity(entitysnowball)) {
|
|
|
|
- if (!entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
+ // Paper start
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entitysnowball.getBukkitEntity());
|
|
|
|
+ if (event.callEvent() && world.addEntity(entitysnowball)) {
|
|
|
|
+ if (event.shouldConsume() && !entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
itemstack.subtract(1);
|
|
|
|
+ } else if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
}
|
|
|
|
|
2018-08-26 20:11:49 +02:00
|
|
|
- world.a((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));
|
2018-08-17 23:55:40 +02:00
|
|
|
- } else if (entityhuman instanceof EntityPlayer) {
|
|
|
|
- ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
2018-08-26 20:11:49 +02:00
|
|
|
+ world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
|
2018-08-17 23:55:40 +02:00
|
|
|
+ } else {
|
|
|
|
+ if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
|
|
}
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
// CraftBukkit end
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
2019-01-01 04:15:55 +01:00
|
|
|
index 87e2825a8..2bddefb80 100644
|
2018-08-17 23:55:40 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
2019-01-01 04:15:55 +01:00
|
|
|
@@ -8,14 +8,38 @@ public class ItemSplashPotion extends ItemPotion {
|
2018-08-17 23:55:40 +02:00
|
|
|
|
|
|
|
public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
|
|
|
|
ItemStack itemstack = entityhuman.b(enumhand);
|
2019-01-01 04:15:55 +01:00
|
|
|
+ /* // Paper start
|
|
|
|
ItemStack itemstack1 = entityhuman.abilities.canInstantlyBuild ? itemstack.cloneItemStack() : itemstack.cloneAndSubtract(1);
|
|
|
|
|
|
|
|
world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_SPLASH_POTION_THROW, SoundCategory.PLAYERS, 0.5F, 0.4F / (ItemSplashPotion.i.nextFloat() * 0.4F + 0.8F));
|
|
|
|
+ */ // Paper end
|
2018-08-17 23:55:40 +02:00
|
|
|
if (!world.isClientSide) {
|
|
|
|
+ // Paper start - ensure stack count matches vanilla behavior without modifying original stack yet
|
|
|
|
+ ItemStack itemstack1 = itemstack.cloneItemStack();
|
|
|
|
+ if (!entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
+ itemstack1.setCount(1);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
EntityPotion entitypotion = new EntityPotion(world, entityhuman, itemstack1);
|
2019-01-01 04:15:55 +01:00
|
|
|
|
2018-08-17 23:55:40 +02:00
|
|
|
entitypotion.a(entityhuman, entityhuman.pitch, entityhuman.yaw, -20.0F, 0.5F, 1.0F);
|
|
|
|
- world.addEntity(entitypotion);
|
|
|
|
+ // Paper start
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entitypotion.getBukkitEntity());
|
|
|
|
+ if (event.callEvent() && world.addEntity(entitypotion)) {
|
|
|
|
+ if (event.shouldConsume() && !entityhuman.abilities.canInstantlyBuild) {
|
|
|
|
+ itemstack.subtract(1);
|
|
|
|
+ } else if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+
|
2018-08-26 20:11:49 +02:00
|
|
|
+ world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_SPLASH_POTION_THROW, SoundCategory.PLAYERS, 0.5F, 0.4F / (Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
|
2018-08-17 23:55:40 +02:00
|
|
|
+ } else {
|
|
|
|
+ if (entityhuman instanceof EntityPlayer) {
|
|
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
|
|
|
--
|
2019-01-01 04:15:55 +01:00
|
|
|
2.20.1
|
2018-08-17 23:55:40 +02:00
|
|
|
|