修复庄园道具卡使用异常

pansong291 · Sep 20, 2019 · 8d4b144 · 8d4b144
1 parent 97b012f
commit 8d4b144
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/src/main/java/pansong291/xposed/quickenergy/AntFarm.java b/app/src/main/java/pansong291/xposed/quickenergy/AntFarm.java
@@ -2,8 +2,6 @@
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import java.util.List;
-import java.util.ArrayList;
 
 public class AntFarm
 {
@@ -238,7 +236,7 @@ public void run()
 
        // 帮好友喂鸡
        if(Config.feedFriendAnimal()) feedFriend(loader);
-       
+
        // 通知好友赶鸡
        if(Config.notifyFriend()) notifyFriend(loader);
 
@@ -748,7 +746,9 @@ private static void useFarmTool(ClassLoader loader, String targetFarmId, ToolTyp
       int toolCount = jo.getInt("toolCount");
       if(toolCount > 0)
       {
-       s = rpcCall_useFarmTool(loader, targetFarmId, jo.getString("toolId"), toolType.name());
+       String toolId = "";
+       if(jo.has("toolId")) toolId = jo.getString("toolId");
+       s = rpcCall_useFarmTool(loader, targetFarmId, toolId, toolType.name());
        jo = new JSONObject(s);
        memo = jo.getString("memo");
        if(memo.equals("SUCCESS"))
@@ -850,7 +850,7 @@ private static void feedFriendAnimal(ClassLoader loader, String friendFarmId, St
    Log.printStackTrace(TAG, t);
   }
  }
- 
+
  private static void notifyFriend(ClassLoader loader)
  {
   try