diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java index aca54a7601..475824a8a5 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java @@ -435,6 +435,17 @@ public Player getPlayer() { return (Player) entity; } + /** + * Get the dPlayer corresponding to this dEntity + * + * @return The dPlayer + */ + + public dPlayer getDenizenPlayer() { + + return new dPlayer(getPlayer()); + } + /** * Check whether this dEntity is a Player * diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FlyCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FlyCommand.java index b2aeb9c272..b33963b118 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FlyCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/FlyCommand.java @@ -57,7 +57,8 @@ else if (!scriptEntry.hasObject("controller") && arg.matchesArgumentType(dPlayer.class) && arg.matchesPrefix("controller, c")) { - scriptEntry.addObject("controller", (arg.asType(dPlayer.class))); + // Check if it matches a dPlayer, but save it as a dEntity + scriptEntry.addObject("controller", (arg.asType(dEntity.class))); } else if (!scriptEntry.hasObject("origin")