Use a default connection side in the packet command.
Dieser Commit ist enthalten in:
Ursprung
da7cd0b10d
Commit
79786b8192
@ -77,7 +77,7 @@ class CommandPacket extends CommandBase {
|
|||||||
private AbstractIntervalTree<Integer, DetailedPacketListener> serverListeners = createTree(ConnectionSide.SERVER_SIDE);
|
private AbstractIntervalTree<Integer, DetailedPacketListener> serverListeners = createTree(ConnectionSide.SERVER_SIDE);
|
||||||
|
|
||||||
public CommandPacket(ErrorReporter reporter, Plugin plugin, Logger logger, ProtocolManager manager) {
|
public CommandPacket(ErrorReporter reporter, Plugin plugin, Logger logger, ProtocolManager manager) {
|
||||||
super(reporter, CommandBase.PERMISSION_ADMIN, NAME, 2);
|
super(reporter, CommandBase.PERMISSION_ADMIN, NAME, 1);
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.manager = manager;
|
this.manager = manager;
|
||||||
@ -227,6 +227,12 @@ class CommandPacket extends CommandBase {
|
|||||||
|
|
||||||
// Perform commands
|
// Perform commands
|
||||||
if (subCommand == SubCommand.ADD) {
|
if (subCommand == SubCommand.ADD) {
|
||||||
|
// The add command is dangerous - don't default on the connection side
|
||||||
|
if (args.length == 1) {
|
||||||
|
sender.sendMessage(ChatColor.RED + "Please specify a connectionn side.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
executeAddCommand(sender, side, detailed, ranges);
|
executeAddCommand(sender, side, detailed, ranges);
|
||||||
} else if (subCommand == SubCommand.REMOVE) {
|
} else if (subCommand == SubCommand.REMOVE) {
|
||||||
executeRemoveCommand(sender, side, detailed, ranges);
|
executeRemoveCommand(sender, side, detailed, ranges);
|
||||||
@ -437,7 +443,13 @@ class CommandPacket extends CommandBase {
|
|||||||
|
|
||||||
// The trees will manage the listeners for us
|
// The trees will manage the listeners for us
|
||||||
if (listener != null) {
|
if (listener != null) {
|
||||||
getListenerTree(side).put(idStart, idStop, listener);
|
if (side.isForClient())
|
||||||
|
clientListeners.put(idStart, idStop, listener);
|
||||||
|
else if (side.isForServer())
|
||||||
|
serverListeners.put(idStart, idStop, listener);
|
||||||
|
else
|
||||||
|
throw new IllegalArgumentException("Not a legal connection side.");
|
||||||
|
|
||||||
return listener;
|
return listener;
|
||||||
} else {
|
} else {
|
||||||
throw new IllegalArgumentException("No packets found in the range " + idStart + " - " + idStop + ".");
|
throw new IllegalArgumentException("No packets found in the range " + idStart + " - " + idStop + ".");
|
||||||
@ -448,14 +460,10 @@ class CommandPacket extends CommandBase {
|
|||||||
ConnectionSide side, int idStart, int idStop, boolean detailed) {
|
ConnectionSide side, int idStart, int idStop, boolean detailed) {
|
||||||
|
|
||||||
// The interval tree will automatically remove the listeners for us
|
// The interval tree will automatically remove the listeners for us
|
||||||
return getListenerTree(side).remove(idStart, idStop);
|
|
||||||
}
|
|
||||||
|
|
||||||
private AbstractIntervalTree<Integer, DetailedPacketListener> getListenerTree(ConnectionSide side) {
|
|
||||||
if (side.isForClient())
|
if (side.isForClient())
|
||||||
return clientListeners;
|
return clientListeners.remove(idStart, idStop);
|
||||||
else if (side.isForServer())
|
else if (side.isForServer())
|
||||||
return serverListeners;
|
return serverListeners.remove(idStart, idStop);
|
||||||
else
|
else
|
||||||
throw new IllegalArgumentException("Not a legal connection side.");
|
throw new IllegalArgumentException("Not a legal connection side.");
|
||||||
}
|
}
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren