mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-03 13:36:44 +01:00
62 lines
3.1 KiB
Diff
62 lines
3.1 KiB
Diff
--- a/net/minecraft/server/ItemTrident.java
|
|
+++ b/net/minecraft/server/ItemTrident.java
|
|
@@ -6,9 +6,13 @@
|
|
|
|
public ItemTrident(Item.Info item_info) {
|
|
super(item_info);
|
|
+ // CraftBukkit start - obfuscator went a little crazy
|
|
+ /*
|
|
this.a(new MinecraftKey("throwing"), (itemstack, world, entityliving) -> {
|
|
return entityliving != null && entityliving.isHandRaised() && entityliving.dm() == itemstack ? 1.0F : 0.0F;
|
|
});
|
|
+ */
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
@Override
|
|
@@ -37,9 +41,12 @@
|
|
|
|
if (k <= 0 || entityhuman.isInWaterOrRain()) {
|
|
if (!world.isClientSide) {
|
|
+ // CraftBukkit - moved down
|
|
+ /*
|
|
itemstack.damage(1, entityhuman, (entityhuman1) -> {
|
|
entityhuman1.d(entityliving.getRaisedHand());
|
|
});
|
|
+ */
|
|
if (k == 0) {
|
|
EntityThrownTrident entitythrowntrident = new EntityThrownTrident(world, entityhuman, itemstack);
|
|
|
|
@@ -48,7 +55,20 @@
|
|
entitythrowntrident.fromPlayer = EntityArrow.PickupStatus.CREATIVE_ONLY;
|
|
}
|
|
|
|
- world.addEntity(entitythrowntrident);
|
|
+ // CraftBukkit start
|
|
+ if (!world.addEntity(entitythrowntrident)) {
|
|
+ if (entityhuman instanceof EntityPlayer) {
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ itemstack.damage(1, entityhuman, (entityhuman1) -> {
|
|
+ entityhuman1.d(entityliving.getRaisedHand());
|
|
+ });
|
|
+ entitythrowntrident.trident = itemstack.cloneItemStack(); // SPIGOT-4511 update since damage call moved
|
|
+ // CraftBukkit end
|
|
+
|
|
world.a((EntityHuman) null, (Entity) entitythrowntrident, SoundEffects.ITEM_TRIDENT_THROW, SoundCategory.PLAYERS, 1.0F, 1.0F);
|
|
if (!entityhuman.abilities.canInstantlyBuild) {
|
|
entityhuman.inventory.f(itemstack);
|
|
@@ -58,6 +78,10 @@
|
|
|
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
|
if (k > 0) {
|
|
+ // CraftBukkit start
|
|
+ org.bukkit.event.player.PlayerRiptideEvent event = new org.bukkit.event.player.PlayerRiptideEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack));
|
|
+ event.getPlayer().getServer().getPluginManager().callEvent(event);
|
|
+ // CraftBukkit end
|
|
float f = entityhuman.yaw;
|
|
float f1 = entityhuman.pitch;
|
|
float f2 = -MathHelper.sin(f * 0.017453292F) * MathHelper.cos(f1 * 0.017453292F);
|