craftbukkit/nms-patches/net/minecraft/world/item/ItemTrident.patch

57 lines
3.3 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/item/ItemTrident.java
+++ b/net/minecraft/world/item/ItemTrident.java
2021-06-11 15:00:00 +10:00
@@ -68,9 +68,12 @@
2019-04-23 12:00:00 +10:00
if (k <= 0 || entityhuman.isInWaterOrRain()) {
if (!world.isClientSide) {
2019-04-23 12:00:00 +10:00
+ // CraftBukkit - moved down
+ /*
2021-11-22 09:00:00 +11:00
itemstack.hurtAndBreak(1, entityhuman, (entityhuman1) -> {
entityhuman1.broadcastBreakEvent(entityliving.getUsedItemHand());
2019-04-23 12:00:00 +10:00
});
+ */
if (k == 0) {
EntityThrownTrident entitythrowntrident = new EntityThrownTrident(world, entityhuman, itemstack);
2021-06-11 15:00:00 +10:00
@@ -79,16 +82,39 @@
entitythrowntrident.pickup = EntityArrow.PickupStatus.CREATIVE_ONLY;
}
2021-11-22 09:00:00 +11:00
- world.addFreshEntity(entitythrowntrident);
+ // CraftBukkit start
2021-11-22 09:00:00 +11:00
+ if (!world.addFreshEntity(entitythrowntrident)) {
2021-03-16 09:00:00 +11:00
+ if (entityhuman instanceof net.minecraft.server.level.EntityPlayer) {
+ ((net.minecraft.server.level.EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
+ }
+ return;
+ }
+
2021-11-22 09:00:00 +11:00
+ itemstack.hurtAndBreak(1, entityhuman, (entityhuman1) -> {
+ entityhuman1.broadcastBreakEvent(entityliving.getUsedItemHand());
2019-04-23 12:00:00 +10:00
+ });
2021-11-22 09:00:00 +11:00
+ entitythrowntrident.tridentItem = itemstack.copy(); // SPIGOT-4511 update since damage call moved
+ // CraftBukkit end
+
2021-06-11 15:00:00 +10:00
world.playSound((EntityHuman) null, (Entity) entitythrowntrident, SoundEffects.TRIDENT_THROW, SoundCategory.PLAYERS, 1.0F, 1.0F);
if (!entityhuman.getAbilities().instabuild) {
2021-11-22 09:00:00 +11:00
entityhuman.getInventory().removeItem(itemstack);
}
2021-01-31 10:08:41 +11:00
+ // CraftBukkit start - SPIGOT-5458 also need in this branch :(
+ } else {
2021-11-22 09:00:00 +11:00
+ itemstack.hurtAndBreak(1, entityhuman, (entityhuman1) -> {
+ entityhuman1.broadcastBreakEvent(entityliving.getUsedItemHand());
+ });
2021-01-31 10:08:41 +11:00
+ // CraftBukkkit end
}
}
2018-08-02 09:38:52 +10:00
2021-11-22 09:00:00 +11:00
entityhuman.awardStat(StatisticList.ITEM_USED.get(this));
2018-08-02 09:38:52 +10:00
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
2021-06-11 15:00:00 +10:00
float f = entityhuman.getYRot();
float f1 = entityhuman.getXRot();
2018-08-02 09:38:52 +10:00
float f2 = -MathHelper.sin(f * 0.017453292F) * MathHelper.cos(f1 * 0.017453292F);