From df4ae0b8e2a3f9376044667a383a844e77f98c68 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Fri, 10 Apr 2015 16:04:47 +0200 Subject: [PATCH] Fixed recursive issue in Player#getName --- src/org/rev317/min/accessors/Character.java | 2 ++ src/org/rev317/min/api/wrappers/Character.java | 3 +++ src/org/rev317/min/api/wrappers/Player.java | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/org/rev317/min/accessors/Character.java b/src/org/rev317/min/accessors/Character.java index 2c907a8..4e9ac2a 100644 --- a/src/org/rev317/min/accessors/Character.java +++ b/src/org/rev317/min/accessors/Character.java @@ -15,5 +15,7 @@ public interface Character { public int getMaxHealth(); public int getInteractingEntity(); + + String getName(); } diff --git a/src/org/rev317/min/api/wrappers/Character.java b/src/org/rev317/min/api/wrappers/Character.java index 1731a3b..e7c3af3 100644 --- a/src/org/rev317/min/api/wrappers/Character.java +++ b/src/org/rev317/min/api/wrappers/Character.java @@ -182,4 +182,7 @@ public class Character implements Locatable { return true; } + public org.rev317.min.accessors.Character getAccessor() { + return accessor; + } } diff --git a/src/org/rev317/min/api/wrappers/Player.java b/src/org/rev317/min/api/wrappers/Player.java index fa5adb1..0c1e505 100644 --- a/src/org/rev317/min/api/wrappers/Player.java +++ b/src/org/rev317/min/api/wrappers/Player.java @@ -10,6 +10,6 @@ public class Player extends Character { } public String getName(){ - return this.getName(); + return getAccessor().getName(); } }