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

31 Zeilen
1.7 KiB
Diff

--- a/net/minecraft/server/ItemEnderPearl.java
+++ b/net/minecraft/server/ItemEnderPearl.java
2019-12-10 23:00:00 +01:00
@@ -10,16 +10,24 @@
public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
ItemStack itemstack = entityhuman.b(enumhand);
2020-06-25 02:00:00 +02:00
- world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_ENDER_PEARL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemEnderPearl.RANDOM.nextFloat() * 0.4F + 0.8F));
2019-07-20 01:00:00 +02:00
- entityhuman.getCooldownTracker().setCooldown(this, 20);
+ // CraftBukkit start - change order
2019-04-23 04:00:00 +02:00
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);
+ }
}
2020-06-25 02:00:00 +02:00
+ world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_ENDER_PEARL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemEnderPearl.RANDOM.nextFloat() * 0.4F + 0.8F));
2019-12-10 23:00:00 +01:00
+ entityhuman.getCooldownTracker().setCooldown(this, 20);
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
+
2018-07-15 02:00:00 +02:00
entityhuman.b(StatisticList.ITEM_USED.b(this));
2019-12-10 23:00:00 +01:00
if (!entityhuman.abilities.canInstantlyBuild) {
itemstack.subtract(1);