2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-21 09:02:07 -07:00
Code Issues Projects Releases Packages Wiki Activity

[events] fixup some things

Browse source
This commit is contained in:
RedSparr0w 2019-09-23 00:39:53 +12:00
parent 78673774c2
commit 059032c01a
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
09HDscape-server/src/org/crandor/Util.java
View file

@ -18,8 +18,7 @@ public class Util {
public static String strToEnum(String name) {
name = name.toUpperCase();
name = name.replaceAll(" ", "_");
return capitalize(name);
return name.replaceAll(" ", "_");
}
public static String enumToString(String name) {

10
09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java
View file

@ -1,5 +1,6 @@
package org.crandor.game.events;
import org.crandor.Util;
import org.crandor.game.node.entity.player.Player;
import org.crandor.game.system.task.Pulse;
import org.crandor.game.world.GameWorld;
@ -150,7 +151,6 @@ public class GlobalEventManager implements CallBack {
public GlobalEventManager activate(GlobalEvent event, String name, int timeToAdd) {
if (timeToAdd <= 0) timeToAdd = 6000;
event.start(timeToAdd);
Player player = Repository.getPlayerByDisplay(name);
@ -162,7 +162,9 @@ public class GlobalEventManager implements CallBack {
message.append(" by " + player.getUsername());
}
message.append(".");
// start the event after building the string
event.start(timeToAdd);
message(message.toString());
player.getPacketDispatch().sendMessage(event.getDescription());
@ -171,7 +173,7 @@ public class GlobalEventManager implements CallBack {
public GlobalEventManager activateHourly(GlobalEvent event) {
event.start(6000);
message(event.getName() + " is now active, and will run for an hour!");
message(event.getName() + " event is now active, and will run for an hour!");
for (Player player : Repository.getPlayers()) {
player.getPacketDispatch().sendMessage(event.getDescription());
}
@ -221,7 +223,7 @@ public class GlobalEventManager implements CallBack {
public static GlobalEvent getEvent(String name) {
for(GlobalEvent event : GlobalEvent.values()){
if (event.getName().equalsIgnoreCase(name))
if (event.getName().equalsIgnoreCase(name) || event.name().equalsIgnoreCase(Util.strToEnum(name)))
return event;
}
return null;

4
09HDscape-server/src/plugin/command/DeveloperCommandPlugin.java
View file

@ -188,7 +188,7 @@ public final class DeveloperCommandPlugin extends CommandPlugin {
if (event == null)
break;
GlobalEventManager.get().activate(event);
player.sendMessage("You have activated the " + eventName + " event!");
player.sendMessage("You have activated the " + event.getName() + " event!");
break;
case "eventdeactivate":
@ -203,7 +203,7 @@ public final class DeveloperCommandPlugin extends CommandPlugin {
if (event == null)
break;
GlobalEventManager.get().deactivate(event);
player.sendMessage("You have deactivated the " + eventName + " event!");
player.sendMessage("You have deactivated the " + event.getName() + " event!");
break;
case "poison":