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 968eed688..3ff2b6e3e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -65,6 +65,7 @@ public class CBean2Proto { .setItemId(item.getItemId()) .setItemNum(itemNum) .setEndingTime(item.getEndingTime()) + .setNextFlushTime(item.getEndingTime() + getRecoverSpeedByItem(item.getItemId())) .build(); return itemProto; } @@ -366,6 +367,9 @@ public class CBean2Proto { return energyRecoverSpeed[1]*60; } int[] recoveryItemInfo = SGameSetting.getGameSetting().getItemRecoveryMap().get(itemId); + if(recoveryItemInfo == null){ + return 0; + } return recoveryItemInfo[2]; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index b7bbfe249..fb98cce35 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -761,6 +761,7 @@ public class ItemUtil { for(Integer itemId : itemForTimeRecoverys){ Item item = itemMap.get(itemId); if(item == null){ + item = itemMap.get(itemId); MapManager.getTimesRecoveryTicket(user,itemId); itemList.add(CBean2Proto.getItem(item,-1)); } diff --git a/test/src/main/java/db/MongoTest.java b/test/src/main/java/db/MongoTest.java new file mode 100644 index 000000000..71ee19bd4 --- /dev/null +++ b/test/src/main/java/db/MongoTest.java @@ -0,0 +1,4 @@ +package db; + +public class MongoTest { +}