geforkt von Mirrors/Paper
39 Zeilen
1.9 KiB
Diff
39 Zeilen
1.9 KiB
Diff
--- a/net/minecraft/server/ItemEnderPearl.java
|
|
+++ b/net/minecraft/server/ItemEnderPearl.java
|
|
@@ -10,20 +10,28 @@
|
|
public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
|
|
ItemStack itemstack = entityhuman.b(enumhand);
|
|
|
|
- if (!entityhuman.abilities.canInstantlyBuild) {
|
|
- itemstack.subtract(1);
|
|
- }
|
|
-
|
|
- world.playSound((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));
|
|
- entityhuman.getCooldownTracker().setCooldown(this, 20);
|
|
+ // CraftBukkit start - change order
|
|
if (!world.isClientSide) {
|
|
EntityEnderPearl entityenderpearl = new EntityEnderPearl(world, entityhuman);
|
|
|
|
entityenderpearl.setItem(itemstack);
|
|
entityenderpearl.a(entityhuman, entityhuman.pitch, entityhuman.yaw, 0.0F, 1.5F, 1.0F);
|
|
- world.addEntity(entityenderpearl);
|
|
+ if (!world.addEntity(entityenderpearl)) {
|
|
+ if (entityhuman instanceof EntityPlayer) {
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
|
|
+ }
|
|
}
|
|
|
|
+ if (!entityhuman.abilities.canInstantlyBuild) {
|
|
+ itemstack.subtract(1);
|
|
+ }
|
|
+
|
|
+ world.playSound((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));
|
|
+ entityhuman.getCooldownTracker().a(this, 20);
|
|
+ // CraftBukkit end
|
|
+
|
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
|
return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, itemstack);
|
|
}
|