Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ronancpl/HeavenMS

Browse Source
This commit is contained in:
ronancpl
2019-05-02 11:02:15 -03:00
parent c2fa7883fe 1213fff1ed
commit 7ae5dd659a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/MapleCharacter.java
View File

@@ -167,6 +167,7 @@ import server.life.MobSkillFactory;
import server.maps.MapleMapItem; import server.maps.MapleMapItem;
import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import org.apache.mina.util.ConcurrentHashSet;
public class MapleCharacter extends AbstractMapleCharacterObject { public class MapleCharacter extends AbstractMapleCharacterObject {
private static final MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); private static final MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
@@ -250,7 +251,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private final Map<Short, MapleQuestStatus> quests; private final Map<Short, MapleQuestStatus> quests;
private Set<MapleMonster> controlled = new LinkedHashSet<>(); private Set<MapleMonster> controlled = new LinkedHashSet<>();
private Map<Integer, String> entered = new LinkedHashMap<>(); private Map<Integer, String> entered = new LinkedHashMap<>();
private Set<MapleMapObject> visibleMapObjects = new LinkedHashSet<>(); private Set<MapleMapObject> visibleMapObjects = new ConcurrentHashSet<>();
private Map<Skill, SkillEntry> skills = new LinkedHashMap<>(); private Map<Skill, SkillEntry> skills = new LinkedHashMap<>();
private Map<Integer, Integer> activeCoupons = new LinkedHashMap<>(); private Map<Integer, Integer> activeCoupons = new LinkedHashMap<>();
private Map<Integer, Integer> activeCouponRates = new LinkedHashMap<>(); private Map<Integer, Integer> activeCouponRates = new LinkedHashMap<>();
@@ -8616,9 +8617,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
} }
} }
}; };
if (map != null) {
map.registerCharacterStatUpdate(r); map.registerCharacterStatUpdate(r);
} }
}
private Pair<MapleStat, Integer> calcHpRatioUpdate(int newHp, int oldHp) { private Pair<MapleStat, Integer> calcHpRatioUpdate(int newHp, int oldHp) {
int delta = newHp - oldHp; int delta = newHp - oldHp;