entity breeding tags: add cast check with default returns

also fix ex command debug message mixup
DenizenScript · Feb 20, 2021 · e7643c5 · e7643c5
1 parent dde4f80
commit e7643c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -1732,7 +1732,10 @@ else if (mtr.angle == BlockFace.EAST) {
         // Returns whether the animal entity is capable of mating with another of its kind.
         // -->
         registerSpawnedOnlyTag("can_breed", (attribute, object) -> {
-            return new ElementTag(((Ageable) object.getLivingEntity()).canBreed());
+            if (!(object.getLivingEntity() instanceof Breedable)) {
+                return new ElementTag(false);
+            }
+            return new ElementTag(((Breedable) object.getLivingEntity()).canBreed());
         });
 
         // <--[tag]
@@ -1744,6 +1747,9 @@ else if (mtr.angle == BlockFace.EAST) {
         // Returns whether the animal entity is trying to with another of its kind.
         // -->
         registerSpawnedOnlyTag("breeding", (attribute, object) -> {
+            if (!(object.getLivingEntity() instanceof Animals)) {
+                return null;
+            }
             return new ElementTag(((Animals) object.getLivingEntity()).getLoveModeTicks() > 0);
         }, "is_breeding");
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/ExCommandHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/ExCommandHandler.java
@@ -87,7 +87,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String
                         sender.sendMessage(ChatColor.YELLOW + "Executing Denizen script command... check the console for full debug output!");
                     }
                     else {
-                        sender.sendMessage(ChatColor.YELLOW + "Executing Denizen script command with no debug output...");
+                        sender.sendMessage(ChatColor.YELLOW + "Executing Denizen script command...");
                     }
                 }
                 else {

diff --git a/.../src/main/java/com/denizenscript/denizen/utilities/command/ExSustainedCommandHandler.java b/.../src/main/java/com/denizenscript/denizen/utilities/command/ExSustainedCommandHandler.java
@@ -90,7 +90,7 @@ else if (Settings.showExHelp()) {
                         sender.sendMessage(ChatColor.YELLOW + "Executing Denizen script command... check the console for full debug output!");
                     }
                     else {
-                        sender.sendMessage(ChatColor.YELLOW + "Executing Denizen script command with no debug output...");
+                        sender.sendMessage(ChatColor.YELLOW + "Executing Denizen script command...");
                     }
                 }
                 else {