Skip to content

Commit

Permalink
Remove listen command
Browse files Browse the repository at this point in the history
This has been deprecated for a long time
  • Loading branch information
Morphan1 committed Jul 18, 2018
1 parent 53f0627 commit ec10b35
Show file tree
Hide file tree
Showing 17 changed files with 0 additions and 2,534 deletions.
27 changes: 0 additions & 27 deletions plugin/src/main/java/net/aufdemrand/denizen/Denizen.java
Expand Up @@ -11,7 +11,6 @@
import net.aufdemrand.denizen.events.player.*;
import net.aufdemrand.denizen.events.world.*;
import net.aufdemrand.denizen.flags.FlagManager;
import net.aufdemrand.denizen.listeners.ListenerRegistry;
import net.aufdemrand.denizen.nms.NMSHandler;
import net.aufdemrand.denizen.nms.NMSVersion;
import net.aufdemrand.denizen.nms.interfaces.FakeArrow;
Expand Down Expand Up @@ -287,7 +286,6 @@ public CommandManager getCommandManager() {
private BukkitCommandRegistry commandRegistry = new BukkitCommandRegistry();
private TriggerRegistry triggerRegistry = new TriggerRegistry();
private RequirementRegistry requirementRegistry = new RequirementRegistry(this);
private ListenerRegistry listenerRegistry = new ListenerRegistry();
private dNPCRegistry dNPCRegistry;


Expand All @@ -299,10 +297,6 @@ public dNPCRegistry getNPCRegistry() {
return dNPCRegistry;
}

public ListenerRegistry getListenerRegistry() {
return listenerRegistry;
}

public RequirementRegistry getRequirementRegistry() {
return requirementRegistry;
}
Expand Down Expand Up @@ -567,7 +561,6 @@ public void onEnable() {
getTriggerRegistry().registerCoreMembers();
}
getRequirementRegistry().registerCoreMembers();
getListenerRegistry().registerCoreMembers();
}
catch (Exception e) {
dB.echoError(e);
Expand Down Expand Up @@ -1005,26 +998,6 @@ public void onDisable() {
// Save offline player inventories
InventoryScriptHelper._savePlayerInventories();

// Deconstruct listeners (server shutdown seems not to be triggering a PlayerQuitEvent)
for (Player player : this.getServer().getOnlinePlayers()) {
getListenerRegistry().deconstructPlayer(dPlayer.mirrorBukkitPlayer(player));
}

for (OfflinePlayer player : this.getServer().getOfflinePlayers()) {
try {
getListenerRegistry().deconstructPlayer(dPlayer.mirrorBukkitPlayer(player));
}
catch (Exception e) {
if (player == null) {
dB.echoError("Tell the Denizen team ASAP about this error! ERR: OPN: " + e.toString());
}
else {
dB.echoError("'" + player.getName() + "' is having trouble deconstructing! " +
"You might have a corrupt player file!");
}
}
}

// Unload loaded dExternals
for (dExternal external : RuntimeCompiler.loadedExternals) {
external.unload();
Expand Down
@@ -1,7 +1,5 @@
package net.aufdemrand.denizen;


import net.aufdemrand.denizen.listeners.AbstractListener;
import net.aufdemrand.denizen.objects.dLocation;
import net.aufdemrand.denizen.objects.dPlayer;
import net.aufdemrand.denizen.objects.notable.NotableManager;
Expand All @@ -26,7 +24,6 @@
import org.bukkit.scheduler.BukkitRunnable;

import java.util.ArrayList;
import java.util.Map;
import java.util.Set;


Expand Down Expand Up @@ -307,91 +304,6 @@ public void save(CommandContext args, CommandSender sender) throws CommandExcept
}


/*
* DENIZEN LISTENER
*/
@Command(
aliases = {"denizen"}, usage = "listener (--player) --id listener_id --report|cancel|finish",
desc = "Checks/cancels/finishes listeners in progress.", modifiers = {"listener"},
min = 1, max = 3, permission = "denizen.basic", flags = "s")
public void listener(CommandContext args, CommandSender sender) throws CommandException {

dPlayer player = null;
if (sender instanceof Player) {
player = dPlayer.mirrorBukkitPlayer((Player) sender);
}

if (args.hasValueFlag("player")) {
player = dPlayer.valueOf(args.getFlag("player"));
}

if (player == null) {
throw new CommandException("Specified player not online or not found!");
}

Map<String, AbstractListener> listeners = denizen.getListenerRegistry().getListenersFor(player);

if (listeners == null || listeners.isEmpty()) {
Messaging.send(sender, player.getName() + " has no active listeners.");
return;
}

if (args.hasValueFlag("report")) {
for (AbstractListener quest : denizen.getListenerRegistry().getListenersFor(player).values()) {
if (quest.getListenerId().equalsIgnoreCase(args.getFlag("report"))) {
Messaging.send(sender, quest.report());
}
}
return;

}
else if (args.hasValueFlag("cancel")) {
for (AbstractListener quest : denizen.getListenerRegistry().getListenersFor(player).values()) {
if (quest.getListenerId().equalsIgnoreCase(args.getFlag("cancel"))) {

Messaging.send(sender, "Cancelling '" + quest.getListenerId() + "' for " + player.getName() + ".");
quest.cancel();
}
}
return;

}
else if (args.hasValueFlag("finish")) {
for (AbstractListener quest : denizen.getListenerRegistry().getListenersFor(player).values()) {
if (quest.getListenerId().equalsIgnoreCase(args.getFlag("finish"))) {
Messaging.send(sender, "Force-finishing '" + quest.getListenerId() + "' for " + player.getName() + ".");
quest.finish();
}
}
return;

}
else if (args.length() > 2 && args.getInteger(1, 0) < 1) {
Messaging.send(sender, "");
Messaging.send(sender, "<f>Use '--report|cancel|finish id' to modify/view a specific quest listener.");
Messaging.send(sender, "<b>Example: /denizen listener --report \"Journey 1\"");
Messaging.send(sender, "");
return;
}

Paginator paginator = new Paginator();
paginator.header("Active quest listeners for " + player.getName() + ":");
paginator.addLine("<e>Key: <a>Type <b>ID");

if (listeners == null || listeners.isEmpty()) {
paginator.addLine("None.");
}
else {
for (AbstractListener quest : listeners.values()) {
paginator.addLine("<a>" + quest.getListenerType() + " <b>" + quest.getListenerId());
}
}

paginator.sendPage(sender, args.getInteger(1, 1));

}


/*
* DENIZEN RELOAD
*/
Expand Down

This file was deleted.

0 comments on commit ec10b35

Please sign in to comment.