bug 修改
parent
982a34d49e
commit
225ebb443a
|
@ -284,7 +284,7 @@ public class MapLogic {
|
||||||
}
|
}
|
||||||
if (crossMapCell != null) {
|
if (crossMapCell != null) {
|
||||||
for (Map.Entry<Integer, Cell> entry : crossMapCell.getBehaviorTriggers().entrySet()) {
|
for (Map.Entry<Integer, Cell> entry : crossMapCell.getBehaviorTriggers().entrySet()) {
|
||||||
if (entry.getValue().getEventId() == -1) {
|
if (entry.getValue() == null || entry.getValue().getEventId() == -1) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
newMap.put(entry.getKey(), entry.getValue());
|
newMap.put(entry.getKey(), entry.getValue());
|
||||||
|
@ -617,10 +617,10 @@ public class MapLogic {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
crossMapCell.getPermanents().put(mapPointConfig.getId(), cell.getEventId());
|
crossMapCell.getPermanents().put(mapPointConfig.getId(), nextEventId);
|
||||||
}
|
}
|
||||||
if (crossMapCell.getBehaviorTriggers().containsKey(cell.getCellId())) {
|
if (cell != null && crossMapCell.getBehaviorTriggers().containsKey(mapManager.getTriggerXY())) {
|
||||||
crossMapCell.getBehaviorTriggers().put(cell.getCellId(), cell);
|
crossMapCell.getBehaviorTriggers().put(mapManager.getTriggerXY(), cell);
|
||||||
}
|
}
|
||||||
mapManager.updateCrossMapInfos(mapId, crossMapCell);
|
mapManager.updateCrossMapInfos(mapId, crossMapCell);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@ package com.ljsd.jieling.handler.map.behavior;
|
||||||
import com.ljsd.jieling.config.MapPointConfig;
|
import com.ljsd.jieling.config.MapPointConfig;
|
||||||
import com.ljsd.jieling.handler.map.Cell;
|
import com.ljsd.jieling.handler.map.Cell;
|
||||||
import com.ljsd.jieling.handler.map.EventType;
|
import com.ljsd.jieling.handler.map.EventType;
|
||||||
import com.ljsd.jieling.handler.map.MapLogic;
|
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.protocols.MapInfoProto;
|
import com.ljsd.jieling.protocols.MapInfoProto;
|
||||||
import com.ljsd.jieling.util.CellUtil;
|
import com.ljsd.jieling.util.CellUtil;
|
||||||
|
|
Loading…
Reference in New Issue