Synchronize 1.7.10 branch for 1.5.2 release

teamhollow · Apr 6, 2019 · e1a13c2 · e1a13c2
1 parent fc490bf
commit e1a13c2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-1.5.1"
+version = "1.7.10-1.5.2"
 group= "com.wildmobsmod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "WildMobs"
 

diff --git a/src/main/java/com/wildmobsmod/entity/EntityConfig.java b/src/main/java/com/wildmobsmod/entity/EntityConfig.java
@@ -99,7 +99,7 @@ public boolean isEnabled()
 	protected static WeightedRandomSelector<ItemStack> buildWeightedRandomSelectorFromStackList(String... stackList) {
 		final int size = stackList.length;
 		if(size < 1) {
-			return new WeightedRandomSelector<>(new ItemStack[]{null}, new double[] {1.0D});
+			return new WeightedRandomSelector<>(new ItemStack[]{null}, new double[]{1.0D});
 		}
 		final ItemStack[] stacks = new ItemStack[size];
 		final int[] weights = new int[size];

diff --git a/src/main/java/com/wildmobsmod/entity/monster/magmaplant/EntityMagmaPlant.java b/src/main/java/com/wildmobsmod/entity/monster/magmaplant/EntityMagmaPlant.java
@@ -72,15 +72,15 @@ public void readEntityFromNBT(NBTTagCompound nbt)
 			this.setStage(b0);
 		}
 		this.setGrowingAge(nbt.getInteger("Age"));
-		nbt.setBoolean("IsWild", this.getIsWild());
+		this.setIsWild(nbt.getBoolean("IsWild"));
 	}
 
 	public void writeEntityToNBT(NBTTagCompound nbt)
 	{
 		super.writeEntityToNBT(nbt);
 		nbt.setByte("Stage", (byte) this.getStage());
 		nbt.setInteger("Age", this.getGrowingAge());
-		this.setIsWild(nbt.getBoolean("IsWild"));
+		nbt.setBoolean("IsWild", this.getIsWild());
 	}
 
 	public int getStage()
@@ -309,7 +309,7 @@ protected void dropFewItems(boolean playerkill, int looting)
 				this.dropItem(WildMobsModItems.magmaPlantSeed, 1);
 			}
 		}
-		else
+		else if( this.rand.nextInt(4) != 0)
 		{
 			this.dropItem(WildMobsModItems.magmaPlantSeed, 1);
 		}

diff --git a/src/main/java/com/wildmobsmod/main/WildMobsMod.java b/src/main/java/com/wildmobsmod/main/WildMobsMod.java
@@ -45,7 +45,7 @@
 @Mod(modid = WildMobsMod.MODID, name = WildMobsMod.MODNAME, version = WildMobsMod.VERSION, guiFactory = "com.wildmobsmod.main.GUIFactory")
 public class WildMobsMod
 {
-	public static final String MODID = "wildmobsmod", MODNAME = "Wild Mobs", VERSION = "1.5.1";
+	public static final String MODID = "wildmobsmod", MODNAME = "Wild Mobs", VERSION = "1.5.2";
 
 	@SidedProxy(clientSide = "com.wildmobsmod.main.ClientProxy", serverSide = "com.wildmobsmod.main.ServerProxy")
 	public static IProxy proxy;

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
         "modid": "wildmobsmod",
         "name": "Wild Mobs",
         "description": "Expands Minecrafts wildlife selection with various animals and monsters in a similar style.",
-        "version": "1.5.1",
+        "version": "1.5.2",
         "mcversion": "1.7.10",
         "url": "",
         "updateUrl": "",