From 25dae2f5aeb8f9415664f4974a93fd49cbd323d8 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Thu, 18 Sep 2025 22:17:47 +0100
Subject: [PATCH] Fix merge error

---
 src/entity/projectile/Trident.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/entity/projectile/Trident.php b/src/entity/projectile/Trident.php
index 73b3880ac..47c502329 100644
--- a/src/entity/projectile/Trident.php
+++ b/src/entity/projectile/Trident.php
@@ -46,7 +46,7 @@ class Trident extends Projectile{
 	public const TAG_ITEM = "Trident"; //TAG_Compound
 	protected const TAG_SPAWNED_IN_CREATIVE = "isCreative"; //TAG_Byte
 
-	public static function getNetworkTypeId() : string{ return EntityIds::THROWN_TRIDENT; }
+	public function getNetworkTypeId() : string{ return EntityIds::THROWN_TRIDENT; }
 
 	protected Item $item;