Add "delay" meta for MOB_SPAWNER

EngineHub · Apr 26, 2018 · 314146e · 314146e
1 parent a7b6d8c
commit 314146e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/main/java/com/laytonsmith/abstraction/MCCreatureSpawner.java b/src/main/java/com/laytonsmith/abstraction/MCCreatureSpawner.java
@@ -4,8 +4,8 @@
 import com.laytonsmith.abstraction.enums.MCEntityType;
 
 public interface MCCreatureSpawner extends MCBlockState {
-
 	MCEntityType getSpawnedType();
-
 	void setSpawnedType(MCEntityType type);
+	int getDelay();
+	void setDelay(int delay);
 }
diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCCreatureSpawner.java b/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCCreatureSpawner.java
@@ -25,4 +25,15 @@ public void setSpawnedType(MCEntityType type) {
 		cs.setSpawnedType(((BukkitMCEntityType) type).getConcrete());
 		cs.update();
 	}
+
+	@Override
+	public int getDelay() {
+		return cs.getDelay();
+	}
+
+	@Override
+	public void setDelay(int delay) {
+		cs.setDelay(delay);
+		cs.update();
+	}
 }
diff --git a/src/main/java/com/laytonsmith/core/ObjectGenerator.java b/src/main/java/com/laytonsmith/core/ObjectGenerator.java
@@ -400,6 +400,7 @@ public Construct itemMeta(MCItemStack is, Target t) {
 				} else if(bs instanceof MCCreatureSpawner) {
 					MCCreatureSpawner mccs = (MCCreatureSpawner) bs;
 					ma.set("spawntype", mccs.getSpawnedType().name());
+					ma.set("delay", new CInt(mccs.getDelay(), t), t);
 				} else if(bs instanceof MCBrewingStand) {
 					MCBrewingStand brewStand = (MCBrewingStand) bs;
 					ma.set("brewtime", new CInt(brewStand.getBrewingTime(), t), t);
@@ -679,12 +680,16 @@ public MCItemMeta itemMeta(Construct c, MCMaterial mat, Target t) throws ConfigR
 						banner.update();
 						bsm.setBlockState(banner);
 					} else if(bs instanceof MCCreatureSpawner) {
+						MCCreatureSpawner mccs = (MCCreatureSpawner) bs;
 						if(ma.containsKey("spawntype")) {
-							MCCreatureSpawner mccs = (MCCreatureSpawner) bs;
 							MCEntityType type = MCEntityType.valueOf(ma.get("spawntype", t).val().toUpperCase());
 							mccs.setSpawnedType(type);
-							bsm.setBlockState(bs);
 						}
+						if(ma.containsKey("delay")) {
+							int delay = Static.getInt32(ma.get("delay", t), t);
+							mccs.setDelay(delay);
+						}
+						bsm.setBlockState(bs);
 					} else if(bs instanceof MCBrewingStand) {
 						MCBrewingStand brewStand = (MCBrewingStand) bs;
 						if(ma.containsKey("brewtime")) {