Deny some abusable group commands while playing

This commit is contained in:
Daniel Saukel 2016-05-15 18:50:22 +02:00
parent 62781f9f88
commit f01a4411a5
2 changed files with 17 additions and 12 deletions

View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.dre2n</groupId>
<artifactId>dungeonsxl</artifactId>
<version>0.11.1</version>
<version>0.11.2</version>
<packaging>jar</packaging>
<name>DungeonsXL</name>
<url>https://dre2n.github.io</url>

View File

@ -132,18 +132,23 @@ public class GroupCommand extends BRCommand {
}
public void disbandGroup(DGroup dGroup) {
if (dGroup != null) {
DGroupDisbandEvent event = new DGroupDisbandEvent(dGroup, player, DGroupDisbandEvent.Cause.COMMAND);
plugin.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
dGroup.delete();
MessageUtil.sendMessage(sender, DMessages.GROUP_DISBANDED.getMessage(sender.getName(), dGroup.getName()));
dGroup = null;
}
} else {
if (dGroup == null) {
MessageUtil.sendMessage(sender, DMessages.ERROR_NO_SUCH_GROUP.getMessage());
return;
}
if (dGroup.isPlaying()) {
MessageUtil.sendMessage(sender, DMessages.ERROR_LEAVE_DUNGEON.getMessage());
return;
}
DGroupDisbandEvent event = new DGroupDisbandEvent(dGroup, player, DGroupDisbandEvent.Cause.COMMAND);
plugin.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
dGroup.delete();
MessageUtil.sendMessage(sender, DMessages.GROUP_DISBANDED.getMessage(sender.getName(), dGroup.getName()));
dGroup = null;
}
}