Fix duplicate item on picking up an unprimed grenade

Parzivail-Modding-Team · Jul 24, 2024 · 980ac86 · 980ac86
1 parent 527f3d8
commit 980ac86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/projects/pswg/src/main/java/com/parzivail/pswg/entity/FragmentationGrenadeEntity.java b/projects/pswg/src/main/java/com/parzivail/pswg/entity/FragmentationGrenadeEntity.java
@@ -55,8 +55,8 @@ public ActionResult interact(PlayerEntity player, Hand hand)
 	{
 		if (!isPrimed() && age > MIN_PICKUP_AGE && player.getInventory().getMainHandStack().isEmpty())
 		{
-			player.giveItemStack(new ItemStack(SwgItems.Explosives.FragmentationGrenade));
-
+			if (getWorld() instanceof ServerWorld)
+				player.giveItemStack(new ItemStack(SwgItems.Explosives.FragmentationGrenade));
 			this.discard();
 		}
 		return super.interact(player, hand);

diff --git a/projects/pswg/src/main/java/com/parzivail/pswg/entity/ThermalDetonatorEntity.java b/projects/pswg/src/main/java/com/parzivail/pswg/entity/ThermalDetonatorEntity.java
@@ -95,8 +95,8 @@ public ActionResult interact(PlayerEntity player, Hand hand)
 	{
 		if (!isPrimed() && age > MIN_PICKUP_AGE && player.getInventory().getMainHandStack().isEmpty())
 		{
-			player.giveItemStack(new ItemStack(SwgItems.Explosives.ThermalDetonator));
-
+			if (getWorld() instanceof ServerWorld)
+				player.giveItemStack(new ItemStack(SwgItems.Explosives.ThermalDetonator));
 			this.discard();
 		}
 		return super.interact(player, hand);