From 3118cd9fd11013fcf427b7e932f5c3ee35ab7dec Mon Sep 17 00:00:00 2001
From: jiahuiwen <1024696487@qq.com>
Date: Mon, 1 Apr 2019 14:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=9C=B0=E5=9B=BE=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ljsd/jieling/handler/map/MapLogic.java  | 12 +++++++++---
 .../handler/map/behavior/DestroyMissionBehavior.java |  1 -
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
index 45c70686d..73dd9b9b3 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
@@ -564,8 +564,8 @@ public class MapLogic {
         }
 //        LOGGER.info("updateEvent =====>success<====== xy=>{}, getPointId=>{} eventId={}, mission=>{}, nextEventId=>{}, eventBehaviorCommon=>{} {} sOptionConfig.getReward()=>{}", mapManager.getCurXY(), cell == null ? 0 : cell.getPointId(),
 //                cell == null ? 0 : cell.getEventId(), eventUpdateResponse.getMissionList(), nextEventId, eventBehaviorCommon,eventUpdateResponse.getDrop(), sOptionConfig.getReward());
-        saveRefreshInfo(pointId, mapManager, mapPointConfig, nextEventId);
-        LOGGER.info("updatemap() uid=>{},nextEventId={},eventId={}", uid, nextEventId, cell == null ? 0 : cell.getEventId());
+        saveRefreshInfo(pointId, mapManager, mapPointConfig, cell == null ? -1 : cell.getEventId());
+        LOGGER.info("updatEvent() uid=>{},nextEventId={},eventId={}", uid, nextEventId, cell == null ? 0 : cell.getEventId());
         MessageUtil.sendMessage(session, 1, messageType.getNumber(), eventUpdateResponse.build(), true);
     }
 
@@ -580,6 +580,9 @@ public class MapLogic {
                 if (saveEventId == -1) {
                     return;
                 }
+                if (saveEventId == nextEventId) {
+                    return;
+                }
             }
             crossMapCell.getDayRefreshs().put(optionId, nextEventId);
         }
@@ -589,6 +592,9 @@ public class MapLogic {
                 if (saveEventId == -1) {
                     return;
                 }
+                if (saveEventId == nextEventId) {
+                    return;
+                }
             }
             crossMapCell.getPermanents().put(optionId, nextEventId);
         }
@@ -943,7 +949,7 @@ public class MapLogic {
                 updateMapMission(user.getMapManager(),EventType.updateEvent,cell.getEventId(),0);
             }
         }
-        LOGGER.info("endFight() uid=>{},nextEventId", uid, nextEventId);
+        LOGGER.info("endFight() uid=>{},nextEventId=>{}", uid, nextEventId);
         updateMapMission(user.getMapManager(),EventType.fightEvent,0,monsterGroupId);
 //        LOGGER.info("endFight() uid=>{} sMonsterGroup.getRewardgroup()=>{} drop=>{}", uid, sMonsterGroup.getRewardgroup(), fightEndResponse.getDrop());
         MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true);
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyMissionBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyMissionBehavior.java
index 053fb8221..82c789621 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyMissionBehavior.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/DestroyMissionBehavior.java
@@ -1,6 +1,5 @@
 package com.ljsd.jieling.handler.map.behavior;
 
-import com.ljsd.jieling.handler.map.Cell;
 import com.ljsd.jieling.handler.map.EventType;
 import com.ljsd.jieling.handler.map.MapLogic;
 import com.ljsd.jieling.handler.mission.CheckMissionReturn;