Fix - determine projectile:

DenizenScript · Jul 29, 2013 · 3961db3 · 3961db3
1 parent e7af77e
commit 3961db3
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java
@@ -718,9 +718,16 @@ public void entityShootBow(EntityShootBowEvent event) {
         		 entity.getType().name() + " shoots arrow"),
         		null, null, context);
 
-        if (determination.toUpperCase().startsWith("PROJECTILE")) {
-        	Entity replaced = entity.getWorld().spawnEntity(entity.getLocation(), EntityType.valueOf(aH.getStringFrom(determination)));
-        	event.setProjectile(replaced);
+        if (dEntity.matches(determination)) {
+        	dEntity newProjectile = dEntity.valueOf(determination);
+        	if (!newProjectile.isSpawned())
+        		try { 
+        			newProjectile = new dEntity(entity.getWorld().spawnEntity(entity.getLocation(), EntityType.valueOf(aH.getStringFrom(determination))));
+        			event.setProjectile(newProjectile.getBukkitEntity());
+        		}
+        		catch(Exception e){}
+        	else
+        		event.setProjectile(newProjectile.getBukkitEntity());
         }
 
         if (determination.toUpperCase().startsWith("CANCELLED"))