From 5b351cb6ee4c177f831ba73c390fc7689ebdcbe9 Mon Sep 17 00:00:00 2001 From: VergilPrime Date: Mon, 23 Nov 2015 07:19:16 -0800 Subject: [PATCH] Added "hostname" to event data for player_login event. --- .../abstraction/bukkit/events/BukkitPlayerEvents.java | 5 +++++ .../laytonsmith/abstraction/events/MCPlayerLoginEvent.java | 1 + .../com/laytonsmith/core/events/drivers/PlayerEvents.java | 2 ++ 3 files changed, 8 insertions(+) diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitPlayerEvents.java b/src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitPlayerEvents.java index 0987399bc..7298408e4 100644 --- a/src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitPlayerEvents.java +++ b/src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitPlayerEvents.java @@ -374,6 +374,11 @@ public void setResult(String rst) { public String getIP() { return event.getAddress().getHostAddress(); } + + @Override + public String getHostname() { + return event.getHostname(); + } } public static class BukkitMCPlayerPreLoginEvent implements MCPlayerPreLoginEvent { diff --git a/src/main/java/com/laytonsmith/abstraction/events/MCPlayerLoginEvent.java b/src/main/java/com/laytonsmith/abstraction/events/MCPlayerLoginEvent.java index 5a3b7439e..0db432094 100644 --- a/src/main/java/com/laytonsmith/abstraction/events/MCPlayerLoginEvent.java +++ b/src/main/java/com/laytonsmith/abstraction/events/MCPlayerLoginEvent.java @@ -12,4 +12,5 @@ public interface MCPlayerLoginEvent extends MCPlayerEvent{ public String getResult(); public void setResult(String rst); public String getIP(); + public String getHostname(); } diff --git a/src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java b/src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java index dc85165b3..828ff03c7 100644 --- a/src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java +++ b/src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java @@ -637,6 +637,7 @@ public String docs() { + "can specify the kick message by modifying 'kickmsg'. " + "{player: The player's name | uuid: The player's unique id | " + "kickmsg: The default kick message | ip: the player's IP address | " + + "hostname: The hostname used to reach the server | " + "result: the default response to their logging in}" + "{kickmsg|result}" + "{player|kickmsg|ip|result}"; @@ -675,6 +676,7 @@ public Map evaluate(BindableEvent e) //TODO: The event.getResult needs to be enum'd map.put("result", new CString(event.getResult(), Target.UNKNOWN)); map.put("kickmsg", new CString(event.getKickMessage(), Target.UNKNOWN)); + map.put("hostname", new CString(event.getHostname(), Target.UNKNOWN)); return map; } else{