diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java index 67711ea24..dfcce0236 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DunBehavior.java @@ -22,7 +22,7 @@ public class DunBehavior extends BaseBehavior { @Override public boolean process(int optionId, User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { - int[] behaviorTypeValue = behaviorTypeValues[0]; + /* int[] behaviorTypeValue = behaviorTypeValues[0]; int randomANums = behaviorTypeValue[0]; int randomBNums = behaviorTypeValue[1]; if(randomANums!=0 || randomBNums!=0){ @@ -39,6 +39,7 @@ public class DunBehavior extends BaseBehavior { BehaviorUtil.addBehaviorInfo(eventId,user.getMapManager(),pos); } } - return true; + return true;*/ + return false; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index a1bcb4648..2c3bd9ddf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -265,10 +265,10 @@ public class CBean2Proto { if (friendManager != null){ Map giveMap =friendManager.getGiveMap(); Map haveRewardMap = friendManager.getHaveRewardMap(); - if (giveMap.size() != 0){ + if (giveMap.size() != 0 && giveMap.containsKey(friendId)){ isGrive = giveMap.get(friendId); } - if (haveRewardMap.size() != 0){ + if (haveRewardMap.size() != 0 && giveMap.containsKey(friendId)){ haveReward = haveRewardMap.get(friendId) ==2?0:haveRewardMap.get(friendId); } }