Add "Animated Death" to config file at Health trait. Fix taking of na…

…med items.
DenizenScript · Mar 12, 2013 · 6a057f5 · 6a057f5
1 parent a94cdac
commit 6a057f5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -51,7 +51,7 @@
 
 
 public class Denizen extends JavaPlugin {
-    public final static int configVersion = 1;
+    public final static int configVersion = 2;
     public static String versionTag = "0.8.8 pre-release";
 
     private boolean startedSuccessful = false;

diff --git a/src/main/java/net/aufdemrand/denizen/Settings.java b/src/main/java/net/aufdemrand/denizen/Settings.java
@@ -67,6 +67,17 @@ public static boolean HealthTraitRespawnEnabled() {
 
 	/*
 	
+	# Whether NPCs with the Health trait should have a death animation
+    
+	*/
+
+	public static boolean HealthTraitAnimatedDeathEnabled() {
+		return DenizenAPI.getCurrentInstance().getConfig()
+               .getBoolean("Traits.Health.Animated Death.Enabled", true);
+	}
+
+	/*
+	
 	# How long it should take for NPCs with the Health trait to respawn
     
 	*/

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
@@ -31,7 +31,7 @@ public class HealthTrait extends Trait implements Listener {
     private int currenthealth = 20;
 
     @Persist("animatedeath")
-    private boolean animatedeath = true;
+    private boolean animatedeath = Settings.HealthTraitAnimatedDeathEnabled();
     @Persist("animatedeathdelayinseconds")
     private String animationDelay = "3s";
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TakeCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TakeCommand.java
@@ -90,7 +90,9 @@ public void execute(ScriptEntry scriptEntry)
 					scriptEntry.getPlayer().setItemInHand(newHandItem);
 				} else {
 					// amount is less than what's in hand, need to make a new itemstack of what's left...
-					newHandItem = new ItemStack(scriptEntry.getPlayer().getItemInHand().getType(), inHandAmt - theAmount, scriptEntry.getPlayer().getItemInHand().getData().getData());
+					newHandItem = new ItemStack(scriptEntry.getPlayer().getItemInHand().getType(),
+							inHandAmt - theAmount, scriptEntry.getPlayer().getItemInHand().getData().getData());
+					newHandItem.setItemMeta(scriptEntry.getPlayer().getItemInHand().getItemMeta());
 					scriptEntry.getPlayer().setItemInHand(newHandItem);
 					scriptEntry.getPlayer().updateInventory();
 				}

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -16,6 +16,8 @@ Traits:
     Respawn:
       Enabled: true
       Delay: 10s
+    Animated Death:
+      Enabled: true
 
 Triggers:
   Chat:
@@ -57,4 +59,4 @@ Commands:
 # configuration file is outdated or too new
 
 Config:
-  Version: 1
+  Version: 2