Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 12:46:04 +01:00
Code Issues Projects Releases Wiki Activity

Minor change to Editor

Browse Source
This commit is contained in:
fullwall 2012-02-27 22:35:54 +08:00
parent 932c561a85
commit 0d3d667f19
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/citizensnpcs/EventListen.java
View File

@ -156,7 +156,7 @@ public class EventListen implements Listener {
*/ */
@EventHandler @EventHandler
public void onPlayerQuit(PlayerQuitEvent event) { public void onPlayerQuit(PlayerQuitEvent event) {
Editor.leaveEditor(event.getPlayer()); Editor.leave(event.getPlayer());
} }
@EventHandler @EventHandler

15
src/main/java/net/citizensnpcs/editor/Editor.java
View File

@ -16,7 +16,7 @@ public abstract class Editor implements Listener {
public abstract void end(); public abstract void end();
public static void enterEditor(Player player, Editor editor) { public static void enter(Player player, Editor editor) {
if (editing.containsKey(player.getName())) { if (editing.containsKey(player.getName())) {
Messaging.sendError(player, "You're already in an editor!"); Messaging.sendError(player, "You're already in an editor!");
return; return;
@ -26,7 +26,18 @@ public abstract class Editor implements Listener {
editing.put(player.getName(), editor); editing.put(player.getName(), editor);
} }
public static void leaveEditor(Player player) { public static void enterOrLeave(Player player, Editor editor) {
Editor edit = editing.get(player.getName());
if (edit == null) {
enter(player, editor);
} else if (edit.getClass() == editor.getClass()) {
leave(player);
} else {
Messaging.sendError(player, "You're already in an editor!");
}
}
public static void leave(Player player) {
if (!editing.containsKey(player.getName())) if (!editing.containsKey(player.getName()))
return; return;
Editor editor = editing.remove(player.getName()); Editor editor = editing.remove(player.getName());