diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java index 926942b13..036c11546 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/EatBuffBehavior.java @@ -1,15 +1,11 @@ package com.ljsd.jieling.handler.map.behavior; -import com.ljsd.jieling.config.SItem; import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.logic.dao.User; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.ItemUtil; import org.springframework.stereotype.Component; -import java.util.HashMap; -import java.util.Map; - @Component public class EatBuffBehavior extends BaseBehavior { @Override @@ -19,14 +15,10 @@ public class EatBuffBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - SItem sItem = SItem.getsItemMap().get(behaviorTypeValues[0][0]); - boolean isEnough = ItemUtil.checkCost(user, sItem, behaviorTypeValues[0][1]); + boolean isEnough = ItemUtil.itemCost(user, behaviorTypeValues); if (!isEnough) { return isEnough; } - Map useItems = new HashMap<>(); - useItems.put(behaviorTypeValues[0][0], behaviorTypeValues[0][1]); - ItemUtil.useItem(user, useItems); return isEnough; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ScoutBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ScoutBehavior.java index 6f1f4f593..3358dfcd0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ScoutBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/ScoutBehavior.java @@ -19,14 +19,10 @@ public class ScoutBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - SItem sItem = SItem.getsItemMap().get(behaviorTypeValues[0][0]); - boolean isEnough = ItemUtil.checkCost(user, sItem, behaviorTypeValues[0][1]); + boolean isEnough = ItemUtil.itemCost(user, behaviorTypeValues); if (!isEnough) { return isEnough; } - Map useItems = new HashMap<>(); - useItems.put(behaviorTypeValues[0][0], behaviorTypeValues[0][1]); - ItemUtil.useItem(user, useItems); return isEnough; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java index fbc9f9e8b..53925d8f3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemAndDestroyBehavior.java @@ -1,6 +1,5 @@ package com.ljsd.jieling.handler.map.behavior; -import com.ljsd.jieling.config.SItem; import com.ljsd.jieling.handler.map.Cell; import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.logic.dao.User; @@ -8,7 +7,6 @@ import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.ItemUtil; import org.springframework.stereotype.Component; -import java.util.HashMap; import java.util.Map; @Component @@ -20,14 +18,10 @@ public class UseItemAndDestroyBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - SItem sItem = SItem.getsItemMap().get(behaviorTypeValues[0][0]); - boolean isEnough = ItemUtil.checkCost(user, sItem, behaviorTypeValues[0][1]); + boolean isEnough = ItemUtil.itemCost(user, behaviorTypeValues); if (!isEnough) { return isEnough; } - Map useItems = new HashMap<>(); - useItems.put(behaviorTypeValues[0][0], behaviorTypeValues[0][1]); - ItemUtil.useItem(user, useItems); Map mapInfo = user.getMapManager().getMapInfo(); mapInfo.remove(user.getMapManager().getCurXY()); user.getMapManager().setMapInfo(mapInfo); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemBehavior.java index 18b612bf4..23ff22530 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/UseItemBehavior.java @@ -1,15 +1,11 @@ package com.ljsd.jieling.handler.map.behavior; -import com.ljsd.jieling.config.SItem; import com.ljsd.jieling.handler.map.EventType; import com.ljsd.jieling.logic.dao.User; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.ItemUtil; import org.springframework.stereotype.Component; -import java.util.HashMap; -import java.util.Map; - @Component public class UseItemBehavior extends BaseBehavior { @Override @@ -19,14 +15,10 @@ public class UseItemBehavior extends BaseBehavior { @Override public boolean process(User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - SItem sItem = SItem.getsItemMap().get(behaviorTypeValues[0][0]); - boolean isEnough = ItemUtil.checkCost(user, sItem, behaviorTypeValues[0][1]); + boolean isEnough = ItemUtil.itemCost(user, behaviorTypeValues); if (!isEnough) { return isEnough; } - Map useItems = new HashMap<>(); - useItems.put(behaviorTypeValues[0][0], behaviorTypeValues[0][1]); - ItemUtil.useItem(user, useItems); return isEnough; } }