Merge branch 'master_prb_gn' into master_test_gn

serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java

@@ -273,8 +273,16 @@ public class ExplorerMapLogic {
     public void recycleFight() {
         try {
             Set<Integer> uids = OnlineUserManager.sessionMap.keySet();
+            long now = TimeUtils.now();
             for (int uid : uids) {
                 User user = UserManager.getUser(uid);
+                if(user == null){
+                    continue;
+                }
+                //登录一分钟后才执行  避免消息线程和分钟线程同时修改数据
+                if(now <  user.getPlayerInfoManager().getLoginTime()+60000){
+                    continue;
+                }
                 Map<Integer, ExplorerInfo> explorer = user.getPlayerInfoManager().getExplorer();
                 if (explorer == null || explorer.size() == 0) {
                     continue;