Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]);
break;
case "PlayerUnbanEvent":
event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2]);
event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "IpBanEvent":
Expand All @@ -142,7 +142,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new IpBannedEvent((IpBanData) args[0], (boolean) args[1]);
break;
case "IpUnbanEvent":
event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2]);
event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "IpMuteEvent":
Expand All @@ -152,7 +152,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new IpMutedEvent((IpMuteData) args[0], (boolean) args[1]);
break;
case "IpUnmutedEvent":
event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2]);
event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "PlayerKickedEvent":
Expand Down Expand Up @@ -180,7 +180,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new NameBannedEvent((NameBanData) args[0], (boolean) args[1]);
break;
case "NameUnbanEvent":
event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2]);
event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "PlayerWarnEvent":
Expand All @@ -197,7 +197,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new IpRangeBannedEvent((IpRangeBanData) args[0], (boolean) args[1]);
break;
case "IpRangeUnbanEvent":
event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2]);
event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "PlayerMuteEvent":
Expand All @@ -207,7 +207,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new PlayerMutedEvent((PlayerMuteData) args[0], (boolean) args[1]);
break;
case "PlayerUnmuteEvent":
event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2]);
event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "PluginReloadedEvent":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerData;


public class IpRangeUnbanEvent extends CustomCancellableEvent {
public class IpRangeUnbanEvent extends SilentCancellableEvent {

@Getter
private IpRangeBanData ban;
@Getter
private PlayerData actor;
@Getter
private String reason;

public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason) {
super(true);
this(ban, actor, reason, false);
}

public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason, boolean silent) {
super(silent, true);

this.ban = ban;
this.actor = actor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerData;


public class IpUnbanEvent extends CustomCancellableEvent {
public class IpUnbanEvent extends SilentCancellableEvent {

@Getter
private IpBanData ban;
@Getter
private PlayerData actor;
@Getter
private String reason;

public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason) {
super(true);
this(ban, actor, reason, false);
}

public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason, boolean silent) {
super(silent, true);

this.ban = ban;
this.actor = actor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerData;


public class IpUnmutedEvent extends CustomCancellableEvent {
public class IpUnmutedEvent extends SilentCancellableEvent {

@Getter
private IpMuteData mute;
@Getter
private PlayerData actor;
@Getter
private String reason;

public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason) {
super(true);
this(mute, actor, reason, false);
}

public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason, boolean silent) {
super(silent, true);

this.mute = mute;
this.actor = actor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerData;


public class NameUnbanEvent extends CustomCancellableEvent {
public class NameUnbanEvent extends SilentCancellableEvent {

@Getter
private NameBanData ban;
@Getter
private PlayerData actor;
@Getter
private String reason;

public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason) {
super(true);
this(ban, actor, reason, false);
}

public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason, boolean silent) {
super(silent, true);

this.ban = ban;
this.actor = actor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerData;


public class PlayerUnbanEvent extends CustomCancellableEvent {
public class PlayerUnbanEvent extends SilentCancellableEvent {

@Getter
private PlayerBanData ban;
@Getter
private PlayerData actor;
@Getter
private String reason;

public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason) {
super(true);
this(ban, actor, reason, false);
}

public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason, boolean silent) {
super(silent, true);

this.ban = ban;
this.actor = actor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerMuteData;


public class PlayerUnmuteEvent extends CustomCancellableEvent {
public class PlayerUnmuteEvent extends SilentCancellableEvent {

@Getter
private PlayerMuteData mute;
@Getter
private PlayerData actor;
@Getter
private String reason;

public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason) {
super(true);
this(mute, actor, reason, false);
}

public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason, boolean silent) {
super(silent, true);

this.mute = mute;
this.actor = actor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@ public void notifyOnWarn(PlayerWarnedEvent event) {
@EventHandler(priority = EventPriority.MONITOR)
public void notifyOnUnban(PlayerUnbanEvent event) {
List<WebhookData> webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason());
sendAll(webhooks, false);
sendAll(webhooks, event.isSilent());
}

@EventHandler(priority = EventPriority.MONITOR)
public void notifyOnUnban(IpUnbanEvent event) {
List<WebhookData> webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason());
sendAll(webhooks, false);
sendAll(webhooks, event.isSilent());
}

@EventHandler(priority = EventPriority.MONITOR)
public void notifyOnUnmute(PlayerUnmuteEvent event) {
List<WebhookData> webhooks = listener.notifyOnUnmute(event.getMute(), event.getActor(), event.getReason());
sendAll(webhooks, false);
sendAll(webhooks, event.isSilent());
}

@EventHandler(priority = EventPriority.MONITOR)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]);
break;
case "PlayerUnbanEvent":
event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2]);
event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "IpBanEvent":
Expand All @@ -127,7 +127,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new IpBannedEvent((IpBanData) args[0], (boolean) args[1]);
break;
case "IpUnbanEvent":
event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2]);
event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "IpMuteEvent":
Expand All @@ -137,7 +137,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new IpMutedEvent((IpMuteData) args[0], (boolean) args[1]);
break;
case "IpUnmutedEvent":
event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2]);
event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "PlayerKickedEvent":
Expand Down Expand Up @@ -165,7 +165,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new NameBannedEvent((NameBanData) args[0], (boolean) args[1]);
break;
case "NameUnbanEvent":
event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2]);
event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "PlayerWarnEvent":
Expand All @@ -182,7 +182,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new IpRangeBannedEvent((IpRangeBanData) args[0], (boolean) args[1]);
break;
case "IpRangeUnbanEvent":
event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2]);
event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "PlayerMuteEvent":
Expand All @@ -192,7 +192,7 @@ public CommonEvent callEvent(String name, Object... args) {
event = new PlayerMutedEvent((PlayerMuteData) args[0], (boolean) args[1]);
break;
case "PlayerUnmuteEvent":
event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2]);
event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]);
break;

case "PluginReloadedEvent":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerData;


public class IpRangeUnbanEvent extends CustomCancellableEvent {
public class IpRangeUnbanEvent extends SilentCancellableEvent {

@Getter
private IpRangeBanData ban;
@Getter
private PlayerData actor;
@Getter
private String reason;

public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason) {
super();
this(ban, actor, reason, false);
}

public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason, boolean silent) {
super(silent);

this.ban = ban;
this.actor = actor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerData;


public class IpUnbanEvent extends CustomCancellableEvent {
public class IpUnbanEvent extends SilentCancellableEvent {

@Getter
private IpBanData ban;
@Getter
private PlayerData actor;
@Getter
private String reason;

public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason) {
super();
this(ban, actor, reason, false);
}

public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason, boolean silent) {
super(silent);

this.ban = ban;
this.actor = actor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerData;


public class IpUnmutedEvent extends CustomCancellableEvent {
public class IpUnmutedEvent extends SilentCancellableEvent {

@Getter
private IpMuteData mute;
@Getter
private PlayerData actor;
@Getter
private String reason;

public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason) {
super();
this(mute, actor, reason, false);
}

public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason, boolean silent) {
super(silent);

this.mute = mute;
this.actor = actor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerData;


public class NameUnbanEvent extends CustomCancellableEvent {
public class NameUnbanEvent extends SilentCancellableEvent {

@Getter
private NameBanData ban;
@Getter
private PlayerData actor;
@Getter
private String reason;

public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason) {
super();
this(ban, actor, reason, false);
}

public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason, boolean silent) {
super(silent);

this.ban = ban;
this.actor = actor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@
import me.confuser.banmanager.common.data.PlayerData;


public class PlayerUnbanEvent extends CustomCancellableEvent {
public class PlayerUnbanEvent extends SilentCancellableEvent {

@Getter
private PlayerBanData ban;
@Getter
private PlayerData actor;
@Getter
private String reason;

public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason) {
super();
this(ban, actor, reason, false);
}

public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason, boolean silent) {
super(silent);

this.ban = ban;
this.actor = actor;
Expand Down
Loading
Loading