From c5383d65075d2db635a98710616631587ffeb2ed Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Fri, 2 Jun 2017 21:38:29 -0500 Subject: [PATCH] Added null resource checks to survey/sample scripts --- .../commands/generic/requestCoreSample.groovy | 16 ++++++++++++++++ scripts/commands/generic/requestSurvey.groovy | 4 ++++ 2 files changed, 20 insertions(+) create mode 100644 scripts/commands/generic/requestCoreSample.groovy diff --git a/scripts/commands/generic/requestCoreSample.groovy b/scripts/commands/generic/requestCoreSample.groovy new file mode 100644 index 000000000..e6613496e --- /dev/null +++ b/scripts/commands/generic/requestCoreSample.groovy @@ -0,0 +1,16 @@ +import resources.objects.SWGObject +import resources.player.Player +import services.galaxy.GalacticManager +import com.projectswg.common.debug.Log +import services.crafting.resource.galactic.storage.GalacticResourceContainer +import intents.crafting.survey.SampleResourceIntent +import intents.chat.ChatBroadcastIntent + +static def execute(GalacticManager galacticManager, Player player, SWGObject target, String args) { + def resource = GalacticResourceContainer.getContainer().getGalacticResourceByName(args) + if (resource == null) { + new ChatBroadcastIntent(player, "Unknown resource: " + args).broadcast() + return + } + new SampleResourceIntent(player.getCreatureObject(), resource).broadcast() +} diff --git a/scripts/commands/generic/requestSurvey.groovy b/scripts/commands/generic/requestSurvey.groovy index 3aa78c6f1..67cd88791 100644 --- a/scripts/commands/generic/requestSurvey.groovy +++ b/scripts/commands/generic/requestSurvey.groovy @@ -8,6 +8,10 @@ import intents.chat.ChatBroadcastIntent static def execute(GalacticManager galacticManager, Player player, SWGObject target, String args) { def resource = GalacticResourceContainer.getContainer().getGalacticResourceByName(args) + if (resource == null) { + new ChatBroadcastIntent(player, "Unknown resource: " + args).broadcast() + return + } if (player.getCreatureObject().hasAbility("admin")) { def spawns = GalacticResourceContainer.getContainer().getTerrainResourceSpawns(resource, player.getCreatureObject().getTerrain()); for (int i = 0; i < spawns.size(); i++) {