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

Quick patch for the last commit

Browse Source 
Fixed some bugs that appeared with the last commit. Added more info on
the event functions documentation.
This commit is contained in:
ronancpl
2017-06-11 11:50:37 -03:00
parent 1afbac2429
commit 9ab79f216a
62 changed files with 178 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/MapleCharacter.java
View File

@@ -719,7 +719,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
}
}
public void setLastCombo(long time) {;
public void setLastCombo(long time) {
lastcombo = time;
}
@@ -1128,8 +1128,6 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
}
public void changeMap(int map, int portal) {
eventChangedMap(map);
MapleMap warpMap;
if (getEventInstance() != null) {
warpMap = getEventInstance().getMapInstance(map);
@@ -1141,8 +1139,6 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
}
public void changeMap(int map, String portal) {
eventChangedMap(map);
MapleMap warpMap;
if (getEventInstance() != null) {
warpMap = getEventInstance().getMapInstance(map);
@@ -1154,8 +1150,6 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
}
public void changeMap(int map, MaplePortal portal) {
eventChangedMap(map);
MapleMap warpMap;
if (getEventInstance() != null) {
warpMap = getEventInstance().getMapInstance(map);
@@ -1171,6 +1165,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
}
public void changeMap(final MapleMap to, final MaplePortal pto) {
eventChangedMap(to.getId());
changeMapInternal(to, pto.getPosition(), MaplePacketCreator.getWarpToMap(to, pto.getId(), this));
}

14
src/scripting/event/EventInstanceManager.java
View File

@@ -303,6 +303,12 @@ public class EventInstanceManager {
public void unregisterPlayer(MapleCharacter chr) {
wL.lock();
try {
try {
em.getIv().invokeFunction("playerUnregistered", EventInstanceManager.this, chr);
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}
chars.remove(chr);
gridRemove(chr);
dropExclusiveItems(chr);
@@ -554,12 +560,8 @@ public class EventInstanceManager {
return props;
}
public Integer getIntProperty(String key) {
try {
return Integer.parseInt(props.getProperty(key));
} catch(Exception e) {
return null;
}
public int getIntProperty(String key) {
return Integer.parseInt(props.getProperty(key));
}
public void leftParty(MapleCharacter chr) {