TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ProjectKorra/master'

Browse source
This commit is contained in:
Benford 2016-02-25 13:10:44 -05:00
commit 147d89c778
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -740,7 +740,7 @@ public class PKListener implements Listener {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(ability.getElement().getColor()); sb.append(ability.getElement().getColor());
sb.append(event.getAbility()); sb.append(event.getAbility().getName());
BENDING_PLAYER_DEATH.put((Player) event.getEntity(), sb.toString()); BENDING_PLAYER_DEATH.put((Player) event.getEntity(), sb.toString());
final Player player = (Player) event.getEntity(); final Player player = (Player) event.getEntity();

10
src/com/projectkorra/projectkorra/event/BendingReloadEvent.java
View file

@ -12,9 +12,10 @@ public class BendingReloadEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private boolean cancelled = false; private boolean cancelled = false;
private CommandSender sender;
public BendingReloadEvent(CommandSender sender) { public BendingReloadEvent(CommandSender sender) {
this.sender = sender;
} }
public HandlerList getHandlers() { public HandlerList getHandlers() {
@ -25,6 +26,13 @@ public class BendingReloadEvent extends Event implements Cancellable {
return handlers; return handlers;
} }
/**
* @return Who called the reload
*/
public CommandSender getSender() {
return sender;
}
/** /**
* @return Whether the event is cancelled * @return Whether the event is cancelled
*/ */