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

Quest clock & ThreadTracker & MapleArrowFetcher patches

Browse Source 
Fixed quest timer UI not disappearing on the client on quest complete.
Fixed a bug on ThreadTracker, not displaying properly the last acquired lock-type.
Fixed MapleArrowFetcher giving out same values from min and max ranges. Max should always be greater than min. Updated DB drops.
Readjusted player ids now starting from 1 again, and moved field oids to start counting from 1bil.
This commit is contained in:
ronancpl
2017-11-18 11:24:24 -02:00
parent 2b38b62683
commit 71ad2ee3a9
49 changed files with 786 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/CashShop.java
+2 -2
View File
@@ -46,7 +46,7 @@ import client.inventory.MapleInventoryType;
import client.inventory.MaplePet;
import constants.ItemConstants;
import java.util.Collections;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
/*
* @author Flav
@@ -242,7 +242,7 @@ public class CashShop {
private List<Item> inventory = new ArrayList<>();
private List<Integer> wishList = new ArrayList<>();
private int notes = 0;
private Lock lock = new MonitoredReentrantLock(MonitoredEnums.CASHSHOP);
private Lock lock = new MonitoredReentrantLock(MonitoredLockType.CASHSHOP);
public CashShop(int accountId, int characterId, int jobType) throws SQLException {
this.accountId = accountId;
src/server/MaplePlayerShop.java
+2 -2
View File
@@ -39,7 +39,7 @@ import server.maps.MapleMapObjectType;
import tools.MaplePacketCreator;
import tools.Pair;
import tools.data.output.MaplePacketLittleEndianWriter;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
/**
*
@@ -56,7 +56,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
private List<String> bannedList = new ArrayList<>();
private List<Pair<MapleCharacter, String>> chatLog = new LinkedList<>();
private Map<Integer, Byte> chatSlot = new LinkedHashMap<>();
private Lock visitorLock = new MonitoredReentrantLock(MonitoredEnums.VISITOR_PSHOP, true);
private Lock visitorLock = new MonitoredReentrantLock(MonitoredLockType.VISITOR_PSHOP, true);
public MaplePlayerShop(MapleCharacter owner, String description) {
this.setPosition(owner.getPosition());
src/server/MapleStorage.java
+2 -2
View File
@@ -38,7 +38,7 @@ import tools.locks.MonitoredReentrantLock;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.Pair;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
/**
*
@@ -51,7 +51,7 @@ public class MapleStorage {
private byte slots;
private Map<MapleInventoryType, List<Item>> typeItems = new HashMap<>();
private List<Item> items;
private Lock lock = new MonitoredReentrantLock(MonitoredEnums.STORAGE, true);
private Lock lock = new MonitoredReentrantLock(MonitoredLockType.STORAGE, true);
private MapleStorage(int id, byte slots, int meso) {
this.id = id;
src/server/life/MapleMonster.java
+4 -4
View File
@@ -63,7 +63,7 @@ import server.maps.MapleMapObjectType;
import tools.MaplePacketCreator;
import tools.Pair;
import tools.Randomizer;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
public class MapleMonster extends AbstractLoadedMapleLife {
private ChangeableStats ostats = null; //unused, v83 WZs offers no support for changeable stats.
@@ -86,9 +86,9 @@ public class MapleMonster extends AbstractLoadedMapleLife {
private int team;
private final HashMap<Integer, AtomicInteger> takenDamage = new HashMap<>();
private Lock externalLock = new MonitoredReentrantLock(MonitoredEnums.MOB_EXT);
private Lock monsterLock = new MonitoredReentrantLock(MonitoredEnums.MOB, true);
private Lock statiLock = new MonitoredReentrantLock(MonitoredEnums.MOB_STATI);
private Lock externalLock = new MonitoredReentrantLock(MonitoredLockType.MOB_EXT);
private Lock monsterLock = new MonitoredReentrantLock(MonitoredLockType.MOB, true);
private Lock statiLock = new MonitoredReentrantLock(MonitoredLockType.MOB_STATI);
public MapleMonster(int id, MapleMonsterStats stats) {
super(id);
src/server/life/MobSkillFactory.java
+2 -2
View File
@@ -35,7 +35,7 @@ import provider.MapleData;
import provider.MapleDataProvider;
import provider.MapleDataProviderFactory;
import provider.MapleDataTool;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
/**
*
@@ -46,7 +46,7 @@ public class MobSkillFactory {
private static Map<String, MobSkill> mobSkills = new HashMap<String, MobSkill>();
private final static MapleDataProvider dataSource = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/Skill.wz"));
private static MapleData skillRoot = dataSource.getData("MobSkill.img");
private final static ReentrantReadWriteLock dataLock = new MonitoredReentrantReadWriteLock(MonitoredEnums.MOBSKILL_FACTORY);
private final static ReentrantReadWriteLock dataLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MOBSKILL_FACTORY);
private final static ReadLock rL = dataLock.readLock();
private final static WriteLock wL = dataLock.writeLock();
src/server/maps/MapleGenericPortal.java
+2 -2
View File
@@ -27,7 +27,7 @@ import scripting.portal.PortalScriptManager;
import server.MaplePortal;
import tools.MaplePacketCreator;
import java.util.concurrent.locks.Lock;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
import tools.locks.MonitoredReentrantLock;
public class MapleGenericPortal implements MaplePortal {
@@ -118,7 +118,7 @@ public class MapleGenericPortal implements MaplePortal {
if(scriptName != null) {
if(scriptLock == null) {
scriptLock = new MonitoredReentrantLock(MonitoredEnums.PORTAL, false);
scriptLock = new MonitoredReentrantLock(MonitoredLockType.PORTAL, true);
}
} else {
scriptLock = null;
src/server/maps/MapleHiredMerchant.java
+2 -2
View File
@@ -45,7 +45,7 @@ import server.MaplePlayerShopItem;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.Pair;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
/**
*
@@ -64,7 +64,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
private List<SoldItem> sold = new LinkedList<>();
private AtomicBoolean open = new AtomicBoolean();
private MapleMap map;
private Lock visitorLock = new MonitoredReentrantLock(MonitoredEnums.VISITOR_MERCH, true);
private Lock visitorLock = new MonitoredReentrantLock(MonitoredLockType.VISITOR_MERCH, true);
public MapleHiredMerchant(final MapleCharacter owner, int itemId, String desc) {
this.setPosition(owner.getPosition());
src/server/maps/MapleMap.java
+13 -12
View File
@@ -86,7 +86,7 @@ import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.Pair;
import tools.Randomizer;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
public class MapleMap {
private static final List<MapleMapObjectType> rangedMapobjectTypes = Arrays.asList(MapleMapObjectType.SHOP, MapleMapObjectType.ITEM, MapleMapObjectType.NPC, MapleMapObjectType.MONSTER, MapleMapObjectType.DOOR, MapleMapObjectType.SUMMON, MapleMapObjectType.REACTOR);
@@ -106,7 +106,7 @@ public class MapleMap {
private MapleFootholdTree footholds = null;
private Rectangle mapArea = new Rectangle();
private int mapid;
private AtomicInteger runningOid = new AtomicInteger(100);
private AtomicInteger runningOid = new AtomicInteger(1000000001);
private int returnMapId;
private int channel, world;
private byte monsterRate;
@@ -163,11 +163,11 @@ public class MapleMap {
if (this.monsterRate == 0) {
this.monsterRate = 1;
}
final ReentrantReadWriteLock chrLock = new MonitoredReentrantReadWriteLock(MonitoredEnums.MAP_CHRS, true);
final ReentrantReadWriteLock chrLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MAP_CHRS, true);
chrRLock = chrLock.readLock();
chrWLock = chrLock.writeLock();
final ReentrantReadWriteLock objectLock = new MonitoredReentrantReadWriteLock(MonitoredEnums.MAP_OBJS, true);
final ReentrantReadWriteLock objectLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MAP_OBJS, true);
objectRLock = objectLock.readLock();
objectWLock = objectLock.writeLock();
}
@@ -389,19 +389,20 @@ public class MapleMap {
}
private int getUsableOID() {
if (runningOid.incrementAndGet() >= 20000000) {
runningOid.set(1000);
}
objectRLock.lock();
try {
if (mapobjects.containsKey(runningOid.get())) {
while (mapobjects.containsKey(runningOid.incrementAndGet()));
}
Integer curOid;
do {
if ((curOid = runningOid.incrementAndGet()) < 0) {
runningOid.set(curOid = 1000000001);
}
} while (mapobjects.containsKey(curOid));
return curOid;
} finally {
objectRLock.unlock();
}
return runningOid.get();
}
public void removeMapObject(int num) {
src/server/maps/MapleMapFactory.java
+2 -2
View File
@@ -47,7 +47,7 @@ import server.life.MapleMonster;
import scripting.event.EventInstanceManager;
import tools.DatabaseConnection;
import tools.StringUtil;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
public class MapleMapFactory {
@@ -66,7 +66,7 @@ public class MapleMapFactory {
this.channel = channel;
this.event = eim;
ReentrantReadWriteLock rrwl = new MonitoredReentrantReadWriteLock(MonitoredEnums.MAP_FACTORY);
ReentrantReadWriteLock rrwl = new MonitoredReentrantReadWriteLock(MonitoredLockType.MAP_FACTORY);
this.mapsRLock = rrwl.readLock();
this.mapsWLock = rrwl.writeLock();
}
src/server/maps/MapleMapItem.java
+2 -2
View File
@@ -27,7 +27,7 @@ import java.awt.Point;
import java.util.concurrent.locks.Lock;
import tools.locks.MonitoredReentrantLock;
import tools.MaplePacketCreator;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
public class MapleMapItem extends AbstractMapleMapObject {
@@ -37,7 +37,7 @@ public class MapleMapItem extends AbstractMapleMapObject {
protected byte type;
protected boolean pickedUp = false, playerDrop;
protected long dropTime;
private Lock itemLock = new MonitoredReentrantLock(MonitoredEnums.MAP_ITEM);
private Lock itemLock = new MonitoredReentrantLock(MonitoredLockType.MAP_ITEM);
public MapleMapItem(Item item, Point position, MapleMapObject dropper, MapleCharacter owner, byte type, boolean playerDrop) {
setPosition(position);
src/server/maps/MapleMiniDungeon.java
+2 -2
View File
@@ -27,7 +27,7 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.locks.Lock;
import tools.locks.MonitoredReentrantLock;
import tools.MaplePacketCreator;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
/**
*
@@ -36,7 +36,7 @@ import tools.locks.MonitoredEnums;
public class MapleMiniDungeon {
List<MapleCharacter> players = new ArrayList<>();
ScheduledFuture<?> timeoutTask = null;
Lock lock = new MonitoredReentrantLock(MonitoredEnums.MINIDUNGEON, true);
Lock lock = new MonitoredReentrantLock(MonitoredLockType.MINIDUNGEON, true);
int baseMap;
long expireTime;
src/server/maps/MapleReactor.java
+2 -2
View File
@@ -35,7 +35,7 @@ import scripting.reactor.ReactorScriptManager;
import server.TimerManager;
import tools.MaplePacketCreator;
import tools.Pair;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
/**
*
@@ -54,7 +54,7 @@ public class MapleReactor extends AbstractMapleMapObject {
private boolean shouldCollect;
private boolean attackHit;
private ScheduledFuture<?> timeoutTask = null;
private Lock reactorLock = new MonitoredReentrantLock(MonitoredEnums.REACTOR, true);
private Lock reactorLock = new MonitoredReentrantLock(MonitoredLockType.REACTOR, true);
public MapleReactor(MapleReactorStats stats, int rid) {
this.evstate = (byte)0;
src/server/quest/MapleQuest.java
+9 -4
View File
@@ -257,11 +257,16 @@ public class MapleQuest {
public void complete(MapleCharacter c, int npc, Integer selection) {
if (autoPreComplete || canComplete(c, npc)) {
for (MapleQuestAction a : completeActs.values()) {
if (!a.check(c, selection)) {
return;
}
for (MapleQuestAction a : completeActs.values()) {
if (!a.check(c, selection)) {
return;
}
}
if (timeLimit > 0) {
c.announce(MaplePacketCreator.removeQuestTimeLimit(id));
}
forceComplete(c, npc);
for (MapleQuestAction a : completeActs.values()) {
a.run(c, selection);