From b4c114f3aec8d8da7c23d734aea0481d98a348f8 Mon Sep 17 00:00:00 2001
From: Cekis <cekisswg@gmail.com>
Date: Wed, 23 Dec 2015 18:39:18 +0100
Subject: [PATCH] Fixed issue preventing veteran reward 30k deed from working
 correctly.

---
 .../systems/veteran_reward/resource.java      | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/systems/veteran_reward/resource.java

diff --git a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/resource.java b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/resource.java
old mode 100644
new mode 100755
index feb0724f1..dbfe3aa2a
--- a/sku.0/sys.server/compiled/game/script/systems/veteran_reward/resource.java
+++ b/sku.0/sys.server/compiled/game/script/systems/veteran_reward/resource.java
@@ -152,35 +152,30 @@ public class resource extends script.base_script
         switch (bp)
         {
             case sui.BP_OK:
-            
-            {
                 obj_id[] resourceTypes = (self.getScriptVars()).getObjIdArray(SCRIPTVAR_TYPES);
                 int rowSelected = sui.getListboxSelectedRow(params);
                 if (rowSelected >= 0 && rowSelected < resourceTypes.length)
                 {
                     showResourceStats(sui.getPlayerId(params), resourceTypes[rowSelected]);
-                    cleanup();
+                    //cleanup();
                 }
-                else 
+                else
                 {
                     String resourceClass = (self.getScriptVars()).getString(SCRIPTVAR_BASE_CLASS);
                     chooseResourceClass(sui.getPlayerId(params), resourceClass);
                 }
-            }
-            break;
+                break;
             case sui.BP_CANCEL:
-            
-            {
                 String resourceClass = (self.getScriptVars()).getString(SCRIPTVAR_BASE_CLASS);
                 if (!resourceClass.equals(ROOT_RESOURCE_CLASS))
                 {
                     chooseResourceClass(sui.getPlayerId(params), getResourceParentClass(resourceClass));
                     break;
                 }
-            }
+                // note: break is purposefully missing here such to carry over to default case and cleanup.
             default:
-            cleanup();
-            break;
+                cleanup();
+                break;
         }
         return SCRIPT_CONTINUE;
     }
@@ -336,12 +331,12 @@ public class resource extends script.base_script
             string_id temp = new string_id("obj_attr_n", resourceAttribs[i].getName());
             attribStrings = utils.addElement(attribStrings, "@" + temp + " = " + resourceAttribs[i].getValue());
         }
-        int pid = sui.listbox(getSelf(), player, "@" + SID_CONFIRM_RESOURCE_SELECTION, sui.OK_CANCEL, "@" + SID_RESOURCE_TITLE, attribStrings, "handleChooseResourceTypeStats", false, false);
+        int pid = sui.listbox(self, player, "@" + SID_CONFIRM_RESOURCE_SELECTION, sui.OK_CANCEL, "@" + SID_RESOURCE_TITLE, attribStrings, "handleChooseResourceTypeStats", false, false);
         if (pid >= 0)
         {
             sui.setSUIProperty(pid, sui.LISTBOX_BTN_CANCEL, sui.PROP_TEXT, "@back");
             sui.showSUIPage(pid);
-            ((getSelf()).getScriptVars()).put(SCRIPTVAR_RESOURCECHOSEN, resource);
+            ((self).getScriptVars()).put(SCRIPTVAR_RESOURCECHOSEN, resource);
         }
         else 
         {