Fixed entity types not being completely random on spawn

Glitchfiend · Dec 6, 2018 · 452a9b7 · 452a9b7
1 parent 07c1dc0
commit 452a9b7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 61 deletions.
diff --git a/src/main/java/familiarfauna/entities/EntityButterfly.java b/src/main/java/familiarfauna/entities/EntityButterfly.java
@@ -162,19 +162,9 @@ public void readEntityFromNBT(NBTTagCompound tagCompund)
     public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, IEntityLivingData livingdata)
     {
         livingdata = super.onInitialSpawn(difficulty, livingdata);
-        int i = this.rand.nextInt(5);
-        boolean flag = false;
-
-        if (livingdata instanceof EntityButterfly.ButterflyTypeData)
-        {
-            i = ((EntityButterfly.ButterflyTypeData)livingdata).typeData;
-            flag = true;
-        }
-        else
-        {
-            livingdata = new EntityButterfly.ButterflyTypeData(i);
-        }
+        int i = this.world.rand.nextInt(5);
 
+        livingdata = new EntityButterfly.ButterflyTypeData(i);
         this.setButterflyType(i);
 
         return livingdata;

diff --git a/src/main/java/familiarfauna/entities/EntityDeer.java b/src/main/java/familiarfauna/entities/EntityDeer.java
@@ -183,20 +183,10 @@ public void onUpdate()
     public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, IEntityLivingData livingdata)
     {
         livingdata = super.onInitialSpawn(difficulty, livingdata);
-        int i = this.rand.nextInt(2);
-        int ii = this.rand.nextInt(5);
-        boolean flag = false;
-
-        if (livingdata instanceof EntityDeer.DeerTypeData)
-        {
-            i = ((EntityDeer.DeerTypeData)livingdata).typeData;
-            flag = true;
-        }
-        else
-        {
-            livingdata = new EntityDeer.DeerTypeData(i);
-        }
+        int i = this.world.rand.nextInt(2);
+        int ii = this.world.rand.nextInt(5);
 
+        livingdata = new EntityDeer.DeerTypeData(i);
         this.setDeerType(i);
 
         if (ii == 0)

diff --git a/src/main/java/familiarfauna/entities/EntityDragonfly.java b/src/main/java/familiarfauna/entities/EntityDragonfly.java
@@ -187,19 +187,9 @@ public void readEntityFromNBT(NBTTagCompound tagCompund)
     public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, IEntityLivingData livingdata)
     {
         livingdata = super.onInitialSpawn(difficulty, livingdata);
-        int i = this.rand.nextInt(4);
-        boolean flag = false;
-
-        if (livingdata instanceof EntityDragonfly.DragonflyTypeData)
-        {
-            i = ((EntityDragonfly.DragonflyTypeData)livingdata).typeData;
-            flag = true;
-        }
-        else
-        {
-            livingdata = new EntityDragonfly.DragonflyTypeData(i);
-        }
+        int i = this.world.rand.nextInt(4);
 
+        livingdata = new EntityDragonfly.DragonflyTypeData(i);
         this.setDragonflyType(i);
 
         return livingdata;

diff --git a/src/main/java/familiarfauna/entities/EntityPixie.java b/src/main/java/familiarfauna/entities/EntityPixie.java
@@ -186,19 +186,9 @@ public void readEntityFromNBT(NBTTagCompound tagCompund)
     public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, IEntityLivingData livingdata)
     {
         livingdata = super.onInitialSpawn(difficulty, livingdata);
-        int i = this.rand.nextInt(3);
-        boolean flag = false;
-
-        if (livingdata instanceof EntityPixie.PixieTypeData)
-        {
-            i = ((EntityPixie.PixieTypeData)livingdata).typeData;
-            flag = true;
-        }
-        else
-        {
-            livingdata = new EntityPixie.PixieTypeData(i);
-        }
+        int i = this.world.rand.nextInt(3);
 
+        livingdata = new EntityPixie.PixieTypeData(i);
         this.setPixieType(i);
 
         return livingdata;

diff --git a/src/main/java/familiarfauna/entities/EntityTurkey.java b/src/main/java/familiarfauna/entities/EntityTurkey.java
@@ -209,19 +209,9 @@ public void onUpdate()
     public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, IEntityLivingData livingdata)
     {
         livingdata = super.onInitialSpawn(difficulty, livingdata);
-        int i = this.rand.nextInt(2);
-        boolean flag = false;
-
-        if (livingdata instanceof EntityTurkey.TurkeyTypeData)
-        {
-            i = ((EntityTurkey.TurkeyTypeData)livingdata).typeData;
-            flag = true;
-        }
-        else
-        {
-            livingdata = new EntityTurkey.TurkeyTypeData(i);
-        }
+        int i = this.world.rand.nextInt(2);
 
+        livingdata = new EntityTurkey.TurkeyTypeData(i);
         this.setTurkeyType(i);
 
         return livingdata;