mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
SPIGOT-2879: Change order of entity addition for ender pearls
This commit is contained in:
parent
1d54397474
commit
9beb0c9968
35
nms-patches/ItemEnderPearl.patch
Normal file
35
nms-patches/ItemEnderPearl.patch
Normal file
@ -0,0 +1,35 @@
|
||||
--- a/net/minecraft/server/ItemEnderPearl.java
|
||||
+++ b/net/minecraft/server/ItemEnderPearl.java
|
||||
@@ -10,18 +10,26 @@
|
||||
public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
|
||||
ItemStack itemstack = entityhuman.b(enumhand);
|
||||
|
||||
+ // CraftBukkit start - change order
|
||||
+ if (!world.isClientSide) {
|
||||
+ EntityEnderPearl entityenderpearl = new EntityEnderPearl(world, entityhuman);
|
||||
+
|
||||
+ entityenderpearl.a(entityhuman, entityhuman.pitch, entityhuman.yaw, 0.0F, 1.5F, 1.0F);
|
||||
+ 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.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.bj, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemEnderPearl.j.nextFloat() * 0.4F + 0.8F));
|
||||
entityhuman.di().a(this, 20);
|
||||
- if (!world.isClientSide) {
|
||||
- EntityEnderPearl entityenderpearl = new EntityEnderPearl(world, entityhuman);
|
||||
-
|
||||
- entityenderpearl.a(entityhuman, entityhuman.pitch, entityhuman.yaw, 0.0F, 1.5F, 1.0F);
|
||||
- world.addEntity(entityenderpearl);
|
||||
- }
|
||||
+ // CraftBukkit end
|
||||
|
||||
entityhuman.b(StatisticList.b((Item) this));
|
||||
return new InteractionResultWrapper(EnumInteractionResult.SUCCESS, itemstack);
|
Loading…
Reference in New Issue
Block a user