Neo City + Revamped EllinPQ + New Release
Fixed Neo City area, now playable. Overhauled the EllinPQ mechanics, such as the "CLEAR" effect when passing maps, and some bug fixes along the way. Refactored a lot of out-of-place classes and properly renamed a few others through the project. Updated readme and licenses through the source, preparing the stage for the new release.
This commit is contained in:
@@ -162,18 +162,19 @@ public class MapleReactor extends AbstractMapleMapObject {
|
||||
return MaplePacketCreator.spawnReactor(this);
|
||||
}
|
||||
|
||||
public void resetReactorActions() {
|
||||
public void resetReactorActions(int newState) {
|
||||
setState((byte) newState);
|
||||
cancelReactorTimeout();
|
||||
setShouldCollect(true);
|
||||
refreshReactorTimeout();
|
||||
|
||||
if(map != null) map.searchItemReactors(this);
|
||||
}
|
||||
|
||||
public void forceHitReactor(final byte newState) {
|
||||
this.lockReactor();
|
||||
try {
|
||||
setState((byte) newState);
|
||||
this.resetReactorActions();
|
||||
|
||||
this.resetReactorActions(newState);
|
||||
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, (short) 0));
|
||||
} finally {
|
||||
this.unlockReactor();
|
||||
@@ -184,9 +185,7 @@ public class MapleReactor extends AbstractMapleMapObject {
|
||||
if(!this.reactorLock.tryLock()) return;
|
||||
|
||||
try {
|
||||
setState((byte) newState);
|
||||
this.resetReactorActions();
|
||||
|
||||
this.resetReactorActions(newState);
|
||||
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, (short) 0));
|
||||
} finally {
|
||||
this.unlockReactor();
|
||||
|
||||
Reference in New Issue
Block a user