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

Buff System & Map skipping fix + properly disposing Storage + Fairness to locks

Browse Source 
Fixed buff system behaving oddly if a buff has value zero, that would render some skills "broken".
Fixed players skipping maps when trying to access portals while under a poor Internet connection.
Fixed storage not disposing players properly in cases where the players does not meet the storage conditions.
Set some locks to use fairness strategy when dealing with atomic code, in order to make the calls to it properly synchronized.
Fixed Aran introductory questline stucking players when certain conditions were met.
Added drop data for some mob versions of Fairy, Yeti and Pepe.
This commit is contained in:
ronancpl
2017-10-29 16:02:50 -02:00
parent 5f1abf3fb3
commit 44949aea37
119 changed files with 760 additions and 32399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/client/MapleCharacter.java
View File

@@ -208,6 +208,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
private String chalktext;
private String dataString;
private String search = null;
private AtomicBoolean mapTransitioning = new AtomicBoolean(true); // player client is currently trying to change maps or log in the game map
private AtomicBoolean awayFromWorld = new AtomicBoolean(true); // player is online, but on cash shop or mts
private AtomicInteger exp = new AtomicInteger();
private AtomicInteger gachaexp = new AtomicInteger();
@@ -268,9 +269,9 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
private ScheduledFuture<?> chairRecoveryTask = null;
private ScheduledFuture<?> pendantOfSpirit = null; //1122017
private List<ScheduledFuture<?>> timers = new ArrayList<>();
private Lock chrLock = new ReentrantLock();
private Lock effLock = new ReentrantLock();
private Lock petLock = new ReentrantLock();
private Lock chrLock = new ReentrantLock(true);
private Lock effLock = new ReentrantLock(true);
private Lock petLock = new ReentrantLock(true);
private Lock prtLock = new ReentrantLock();
private Map<Integer, Set<Integer>> excluded = new LinkedHashMap<>();
private Set<Integer> excludedItems = new LinkedHashSet<>();
@@ -1251,6 +1252,8 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
private void changeMapInternal(final MapleMap to, final Point pos, final byte[] warpPacket) {
if(!canWarpMap) return;
this.mapTransitioning.set(true);
this.unregisterChairBuff();
this.clearBanishPlayerData();
this.closePlayerInteractions();
@@ -1288,18 +1291,26 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
int temp = newWarpMap;
newWarpMap = -1;
changeMap(temp);
} else {
// if this event map has a gate already opened, render it
EventInstanceManager eim = getEventInstance();
if(eim != null) {
eim.recoverOpenedGate(this, map.getId());
}
// if this map has obstacle components moving, make it do so for this client
for(Entry<String, Integer> e: map.getEnvironment().entrySet()) {
announce(MaplePacketCreator.environmentMove(e.getKey(), e.getValue()));
}
}
// if this event map has a gate already opened, render it
EventInstanceManager eim = getEventInstance();
if(eim != null) {
eim.recoverOpenedGate(this, map.getId());
}
// if this map has obstacle components moving, make it do so for this client
for(Entry<String, Integer> e: map.getEnvironment().entrySet()) {
announce(MaplePacketCreator.environmentMove(e.getKey(), e.getValue()));
}
}
public boolean isChangingMaps() {
return this.mapTransitioning.get();
}
public void setMapTransitionComplete() {
this.mapTransitioning.set(false);
}
public void changePage(int page) {
@@ -3322,7 +3333,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
addItemEffectHolder(sourceid, expirationtime, appliedStatups);
for (Entry<MapleBuffStat, MapleBuffStatValueHolder> statup : toDeploy.entrySet()) {
if(statup.getValue().value != 0) effects.put(statup.getKey(), statup.getValue());
effects.put(statup.getKey(), statup.getValue());
}
} finally {
chrLock.unlock();