2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/item/ItemEnderPearl.java
|
|
|
|
+++ b/net/minecraft/world/item/ItemEnderPearl.java
|
|
|
|
@@ -19,16 +19,24 @@
|
2021-11-21 23:00:00 +01:00
|
|
|
public InteractionResultWrapper<ItemStack> use(World world, EntityHuman entityhuman, EnumHand enumhand) {
|
|
|
|
ItemStack itemstack = entityhuman.getItemInHand(enumhand);
|
2016-12-02 23:55:36 +01:00
|
|
|
|
2021-11-21 23:00:00 +01:00
|
|
|
- world.playSound((EntityHuman) null, entityhuman.getX(), entityhuman.getY(), entityhuman.getZ(), SoundEffects.ENDER_PEARL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
|
|
|
|
- entityhuman.getCooldowns().addCooldown(this, 20);
|
2016-12-02 23:55:36 +01:00
|
|
|
+ // CraftBukkit start - change order
|
2019-04-23 04:00:00 +02:00
|
|
|
if (!world.isClientSide) {
|
|
|
|
EntityEnderPearl entityenderpearl = new EntityEnderPearl(world, entityhuman);
|
|
|
|
|
|
|
|
entityenderpearl.setItem(itemstack);
|
2021-11-21 23:00:00 +01:00
|
|
|
entityenderpearl.shootFromRotation(entityhuman, entityhuman.getXRot(), entityhuman.getYRot(), 0.0F, 1.5F, 1.0F);
|
|
|
|
- world.addFreshEntity(entityenderpearl);
|
|
|
|
+ if (!world.addFreshEntity(entityenderpearl)) {
|
2021-03-15 23:00:00 +01:00
|
|
|
+ if (entityhuman instanceof net.minecraft.server.level.EntityPlayer) {
|
|
|
|
+ ((net.minecraft.server.level.EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
2016-12-02 23:55:36 +01:00
|
|
|
+ }
|
2021-03-15 23:00:00 +01:00
|
|
|
+ return InteractionResultWrapper.fail(itemstack);
|
2016-12-02 23:55:36 +01:00
|
|
|
+ }
|
|
|
|
}
|
|
|
|
|
2021-11-21 23:00:00 +01:00
|
|
|
+ world.playSound((EntityHuman) null, entityhuman.getX(), entityhuman.getY(), entityhuman.getZ(), SoundEffects.ENDER_PEARL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
|
|
|
|
+ entityhuman.getCooldowns().addCooldown(this, 20);
|
2016-12-02 23:55:36 +01:00
|
|
|
+ // CraftBukkit end
|
2019-04-23 04:00:00 +02:00
|
|
|
+
|
2021-11-21 23:00:00 +01:00
|
|
|
entityhuman.awardStat(StatisticList.ITEM_USED.get(this));
|
2021-06-11 07:00:00 +02:00
|
|
|
if (!entityhuman.getAbilities().instabuild) {
|
2021-11-21 23:00:00 +01:00
|
|
|
itemstack.shrink(1);
|