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

Aran skill & mount quests + New player IDs + MapleSkillMakerFetcher

Browse Source 
Aran skill and mount questlines fixed.
Player ID starts counting from 20mil now, preventing clashes with map objects oid's (trying to solve the NPC disappearing issue).
New tool: MapleSkillMakerFetcher. It compiles a SQL script file containing updated Maker data info from the inputted ItemMake.wz.xml.
Updated Maker tables on the DB.
This commit is contained in:
ronancpl
2017-11-14 16:55:37 -02:00
parent 6fbd23f903
commit bc482ee0d2
72 changed files with 41495 additions and 18673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/maps/MapleMap.java
View File

@@ -387,7 +387,7 @@ public class MapleMap {
}
private int getUsableOID() {
if (runningOid.incrementAndGet() > 2000000000) {
if (runningOid.incrementAndGet() >= 20000000) {
runningOid.set(1000);
}
objectRLock.lock();
@@ -865,6 +865,8 @@ public class MapleMap {
if (!monster.isAlive()) {
return false;
}
/* pyramid not implemented
Pair<Integer, Integer> cool = monster.getStats().getCool();
if (cool != null) {
Pyramid pq = (Pyramid) chr.getPartyQuest();
@@ -885,6 +887,8 @@ public class MapleMap {
killed = true;
}
}
*/
if (damage > 0) {
monster.damage(chr, damage);
if (!monster.isAlive()) { // monster just died
@@ -1070,9 +1074,7 @@ public class MapleMap {
}
public void softKillAllMonsters() {
for (SpawnPoint spawnPoint : monsterSpawn) {
spawnPoint.setDenySpawn(true);
}
closeMapSpawnPoints();
for (MapleMapObject monstermo : getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER))) {
MapleMonster monster = (MapleMonster) monstermo;
@@ -1086,9 +1088,7 @@ public class MapleMap {
}
public void killAllMonstersNotFriendly() {
for (SpawnPoint spawnPoint : monsterSpawn) {
spawnPoint.setDenySpawn(true);
}
closeMapSpawnPoints();
for (MapleMapObject monstermo : getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER))) {
MapleMonster monster = (MapleMonster) monstermo;
@@ -1101,9 +1101,7 @@ public class MapleMap {
}
public void killAllMonsters() {
for (SpawnPoint spawnPoint : monsterSpawn) {
spawnPoint.setDenySpawn(true);
}
closeMapSpawnPoints();
for (MapleMapObject monstermo : getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER))) {
MapleMonster monster = (MapleMonster) monstermo;
@@ -2834,6 +2832,12 @@ public class MapleMap {
}
}
public void closeMapSpawnPoints() {
for (SpawnPoint spawnPoint : monsterSpawn) {
spawnPoint.setDenySpawn(true);
}
}
public void restoreMapSpawnPoints() {
for (SpawnPoint spawnPoint : monsterSpawn) {
spawnPoint.setDenySpawn(false);