2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/entity/projectile/EntityThrownTrident.java
|
|
|
|
|
+++ b/net/minecraft/world/entity/projectile/EntityThrownTrident.java
|
2024-06-13 17:05:00 +02:00
|
|
|
@@ -24,6 +24,10 @@
|
2024-02-21 10:55:34 +01:00
|
|
|
import net.minecraft.world.phys.MovingObjectPositionEntity;
|
|
|
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
|
|
|
|
|
|
+// CraftBukkit start
|
|
|
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
|
|
|
|
+// CraftBukkit end
|
|
|
|
|
+
|
|
|
|
|
public class EntityThrownTrident extends EntityArrow {
|
|
|
|
|
|
|
|
|
|
private static final DataWatcherObject<Byte> ID_LOYALTY = DataWatcher.defineId(EntityThrownTrident.class, DataWatcherRegistry.BYTE);
|
2024-06-13 17:05:00 +02:00
|
|
|
@@ -69,7 +73,7 @@
|
2024-02-21 10:55:34 +01:00
|
|
|
this.spawnAtLocation(this.getPickupItem(), 0.1F);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- this.discard();
|
|
|
|
|
+ this.discard(EntityRemoveEvent.Cause.DROP); // CraftBukkit - add Bukkit remove cause
|
|
|
|
|
} else {
|
|
|
|
|
this.setNoPhysics(true);
|
|
|
|
|
Vec3D vec3d = entity.getEyePosition().subtract(this.position());
|
2024-06-13 17:05:00 +02:00
|
|
|
@@ -129,7 +133,7 @@
|
|
|
|
|
|
|
|
|
|
world = this.level();
|
|
|
|
|
if (world instanceof WorldServer) {
|
|
|
|
|
- worldserver = (WorldServer) world;
|
|
|
|
|
+ WorldServer worldserver = (WorldServer) world; // CraftBukkit - decompile error
|
|
|
|
|
EnchantmentManager.doPostAttackEffectsWithItemSource(worldserver, entity, damagesource, this.getWeaponItem());
|
|
|
|
|
}
|
|
|
|
|
|
