From ee77620891b5972daa19a73e24b920b1e038c46b Mon Sep 17 00:00:00 2001
From: Cekis <cekisswg@gmail.com>
Date: Sun, 3 Apr 2016 19:09:23 +0100
Subject: [PATCH] Java overhaul continued...

---
 .../compiled/game/script/data_item/base.java  | 17 +++----
 .../game/script/data_item/dropoff.java        | 45 +++++--------------
 2 files changed, 17 insertions(+), 45 deletions(-)
 mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/data_item/base.java
 mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/data_item/dropoff.java

diff --git a/sku.0/sys.server/compiled/game/script/data_item/base.java b/sku.0/sys.server/compiled/game/script/data_item/base.java
old mode 100644
new mode 100755
index 8bd758f7d..564c33eac
--- a/sku.0/sys.server/compiled/game/script/data_item/base.java
+++ b/sku.0/sys.server/compiled/game/script/data_item/base.java
@@ -1,12 +1,9 @@
 package script.data_item;
 
-import script.*;
-import script.base_class.*;
-import script.combat_engine.*;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.Vector;
-import script.base_script;
+import script.menu_info;
+import script.menu_info_data;
+import script.menu_info_types;
+import script.obj_id;
 
 public class base extends script.base_script
 {
@@ -16,11 +13,7 @@ public class base extends script.base_script
     public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException
     {
         menu_info_data mid = mi.getMenuItemByType(menu_info_types.EXAMINE);
-        if (mid == null)
-        {
-        }
-        else 
-        {
+        if (mid != null) {
             mid.setServerNotify(true);
         }
         return SCRIPT_CONTINUE;
diff --git a/sku.0/sys.server/compiled/game/script/data_item/dropoff.java b/sku.0/sys.server/compiled/game/script/data_item/dropoff.java
old mode 100644
new mode 100755
index 0451ff818..5eb537a64
--- a/sku.0/sys.server/compiled/game/script/data_item/dropoff.java
+++ b/sku.0/sys.server/compiled/game/script/data_item/dropoff.java
@@ -1,14 +1,8 @@
 package script.data_item;
 
-import script.*;
-import script.base_class.*;
-import script.combat_engine.*;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.Vector;
-import script.base_script;
-
 import script.library.loot;
+import script.obj_id;
+import script.string_id;
 
 public class dropoff extends script.item.container.add_only
 {
@@ -18,44 +12,29 @@ public class dropoff extends script.item.container.add_only
     public static final string_id SID_DATA_ONLY = new string_id("error_message", "data_only");
     public int OnAboutToReceiveItem(obj_id self, obj_id srcContainer, obj_id transferer, obj_id item) throws InterruptedException
     {
-        if (isPlayer(transferer))
-        {
-            if (!loot.isFactionalDataItem(item))
-            {
-                sendSystemMessage(transferer, SID_DATA_ONLY);
-                return SCRIPT_OVERRIDE;
-            }
+        if (isPlayer(transferer) && !loot.isFactionalDataItem(item)){
+            sendSystemMessage(transferer, SID_DATA_ONLY);
+            return SCRIPT_OVERRIDE;
         }
         return SCRIPT_CONTINUE;
     }
     public int OnReceivedItem(obj_id self, obj_id srcContainer, obj_id transferer, obj_id item) throws InterruptedException
     {
-        if (isPlayer(transferer))
-        {
-            if (loot.isFactionalDataItem(item))
+        if (isPlayer(transferer) && loot.isFactionalDataItem(item)){
+            if (!loot.redeemFactionCoupon(getContainedBy(self), transferer, item))
             {
-                if (!loot.redeemFactionCoupon(getContainedBy(self), transferer, item))
-                {
-                    debugSpeakMsg(transferer, "redeem failed: returning coupon to source container!");
-                    putIn(item, srcContainer);
-                }
-                return SCRIPT_CONTINUE;
+                debugSpeakMsg(transferer, "redeem failed: returning coupon to source container!");
+                putIn(item, srcContainer);
             }
+            return SCRIPT_CONTINUE;
         }
         return SCRIPT_CONTINUE;
     }
     public int OnClosedContainer(obj_id self, obj_id who) throws InterruptedException
     {
         obj_id[] contents = getContents(self);
-        if ((contents == null) || (contents.length == 0))
-        {
-        }
-        else 
-        {
-            for (int i = 0; i < contents.length; i++)
-            {
-                destroyObject(contents[i]);
-            }
+        for (obj_id content : contents) {
+            destroyObject(content);
         }
         return SCRIPT_CONTINUE;
     }