Fixed wrong container error message being used for ContainerResult.SL…

…OT_OCCUPIED
ProjectSWGCore · Jul 1, 2024 · 4021345 · 4021345
1 parent 6722a59
commit 4021345
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...m/projectswg/holocore/resources/support/global/commands/callbacks/TransferItemCallback.kt b/...m/projectswg/holocore/resources/support/global/commands/callbacks/TransferItemCallback.kt
@@ -239,7 +239,7 @@ class TransferItemCallback : ICmdCallback {
 				}
 
 				ContainerResult.SLOT_OCCUPIED  -> {
-					SystemMessageIntent(player, "@container_error_message:container08").broadcast()
+					SystemMessageIntent(player, "@container_error_message:container04").broadcast()
 					player.sendPacket(PlayMusicMessage(0, "sound/ui_negative.snd", 1, false))
 				}
 			}

diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/combat/loot/GrantLootService.java b/src/main/java/com/projectswg/holocore/services/gameplay/combat/loot/GrantLootService.java
@@ -270,14 +270,18 @@ protected synchronized void transferItem(CreatureObject looter, SWGObject item)
 					new SystemMessageIntent(player, "@container_error_message:container03").broadcast();
 					player.sendPacket(new PlayMusicMessage(0, "sound/ui_danger_message.snd", 1, false));
 					break;
-				case NO_PERMISSION, SLOT_OCCUPIED:
+				case NO_PERMISSION:
 					new SystemMessageIntent(player, "@container_error_message:container08").broadcast();
 					player.sendPacket(new PlayMusicMessage(0, "sound/ui_negative.snd", 1, false));
 					break;
 				case SLOT_NO_EXIST:
 					new SystemMessageIntent(player, "@container_error_message:container06").broadcast();
 					player.sendPacket(new PlayMusicMessage(0, "sound/ui_negative.snd", 1, false));
 					break;
+				case SLOT_OCCUPIED:
+					new SystemMessageIntent(player, "@container_error_message:container04").broadcast();
+					player.sendPacket(new PlayMusicMessage(0, "sound/ui_negative.snd", 1, false));
+					break;
 			}
 		}