summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeildmaster <admin@feildmaster.com>2012-02-19 02:49:51 -0600
committerEvilSeph <evilseph@gmail.com>2012-02-19 04:10:06 -0500
commit7288e2adb714a0679d1206a296e474aa4de9bd51 (patch)
tree3b8bb3dc08355e4e18fd3b76d6dc5e1328be97c4
parent79da5a149db83ced049b6a4f28a3486bef6f7dd8 (diff)
downloadbukkit-7288e2adb714a0679d1206a296e474aa4de9bd51.tar
bukkit-7288e2adb714a0679d1206a296e474aa4de9bd51.tar.gz
bukkit-7288e2adb714a0679d1206a296e474aa4de9bd51.tar.lz
bukkit-7288e2adb714a0679d1206a296e474aa4de9bd51.tar.xz
bukkit-7288e2adb714a0679d1206a296e474aa4de9bd51.zip
[Bleeding] Specify event name in exception. Addresses BUKKIT-778
-rw-r--r--src/main/java/org/bukkit/event/Event.java19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
index 8b91f922..e2fa3023 100644
--- a/src/main/java/org/bukkit/event/Event.java
+++ b/src/main/java/org/bukkit/event/Event.java
@@ -7,24 +7,15 @@ import java.io.Serializable;
*/
@SuppressWarnings("serial")
public abstract class Event implements Serializable {
- private final String name;
-
- protected Event() {
- this(null);
- }
-
- protected Event(final String name) {
- if (name == null) {
- this.name = getClass().getName();
- } else {
- this.name = name;
- }
- }
+ private String name;
/**
* @return Name of this event
*/
- public final String getEventName() {
+ public String getEventName() {
+ if (name == null) {
+ name = getClass().getSimpleName();
+ }
return name;
}