diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java index 5837b8318..91831adeb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java @@ -109,10 +109,10 @@ public class EquipManager extends MongoBase { public Baubles getBaubles(String equipId) { PropertyItem item = equipMap.get(equipId); - if (item == null){ - return null; + if (item instanceof Baubles){ + return (Baubles) item; } - return (Baubles) item; + return null; } public void loadFaxiang(String key,String heroId) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java index ec81c4d06..422d0ebf5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java @@ -301,7 +301,12 @@ public class SessionManager implements INetSession, INetReceived