Rename and clean up MapleReactor

This commit is contained in:
P0nk
2021-09-09 22:38:03 +02:00
parent d7851ef40e
commit dc4d710d12
11 changed files with 89 additions and 94 deletions

View File

@@ -23,7 +23,7 @@ package scripting.reactor;
import client.Client;
import scripting.AbstractScriptManager;
import server.maps.MapleReactor;
import server.maps.Reactor;
import server.maps.ReactorDropEntry;
import tools.DatabaseConnection;
import tools.FilePrinter;
@@ -51,7 +51,7 @@ public class ReactorScriptManager extends AbstractScriptManager {
return instance;
}
public void onHit(Client c, MapleReactor reactor) {
public void onHit(Client c, Reactor reactor) {
try {
Invocable iv = initializeInvocable(c, reactor);
if (iv == null) {
@@ -66,7 +66,7 @@ public class ReactorScriptManager extends AbstractScriptManager {
}
}
public void act(Client c, MapleReactor reactor) {
public void act(Client c, Reactor reactor) {
try {
Invocable iv = initializeInvocable(c, reactor);
if (iv == null) {
@@ -104,15 +104,15 @@ public class ReactorScriptManager extends AbstractScriptManager {
drops.clear();
}
public void touch(Client c, MapleReactor reactor) {
public void touch(Client c, Reactor reactor) {
touching(c, reactor, true);
}
public void untouch(Client c, MapleReactor reactor) {
public void untouch(Client c, Reactor reactor) {
touching(c, reactor, false);
}
private void touching(Client c, MapleReactor reactor, boolean touching) {
private void touching(Client c, Reactor reactor, boolean touching) {
try {
Invocable iv = initializeInvocable(c, reactor);
if (iv == null) {
@@ -129,7 +129,7 @@ public class ReactorScriptManager extends AbstractScriptManager {
}
}
private Invocable initializeInvocable(Client c, MapleReactor reactor) {
private Invocable initializeInvocable(Client c, Reactor reactor) {
ScriptEngine engine = getInvocableScriptEngine("reactor/" + reactor.getId() + ".js", c);
if (engine == null) {
return null;