mirror of
https://github.com/TotalFreedomMC/TF-ProjectKorra.git
synced 2024-08-17 08:57:40 +00:00
Merge remote-tracking branch 'refs/remotes/ProjectKorra/master'
This commit is contained in:
commit
147d89c778
|
@ -740,7 +740,7 @@ public class PKListener implements Listener {
|
|||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append(ability.getElement().getColor());
|
||||
sb.append(event.getAbility());
|
||||
sb.append(event.getAbility().getName());
|
||||
BENDING_PLAYER_DEATH.put((Player) event.getEntity(), sb.toString());
|
||||
final Player player = (Player) event.getEntity();
|
||||
|
||||
|
|
|
@ -12,9 +12,10 @@ public class BendingReloadEvent extends Event implements Cancellable {
|
|||
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private boolean cancelled = false;
|
||||
private CommandSender sender;
|
||||
|
||||
public BendingReloadEvent(CommandSender sender) {
|
||||
|
||||
this.sender = sender;
|
||||
}
|
||||
|
||||
public HandlerList getHandlers() {
|
||||
|
@ -25,6 +26,13 @@ public class BendingReloadEvent extends Event implements Cancellable {
|
|||
return handlers;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Who called the reload
|
||||
*/
|
||||
public CommandSender getSender() {
|
||||
return sender;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether the event is cancelled
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue