Compare commits

...

2 Commits

Author SHA1 Message Date
Electroblob77 01cea3df06 Update version number 2019-10-05 23:14:29 +01:00
Electroblob77 591cfb5857 Check we're dealing with the type of mob whose class we're in, fixes #274 2019-10-05 23:13:48 +01:00
6 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
version = "4.2.4" // There, it matches semver, happy now? version = "4.2.5" // There, it matches semver, happy now?
group= "electroblob.wizardry"// http://maven.apache.org/guides/mini/guide-naming-conventions.html group= "electroblob.wizardry"// http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "ElectroblobsWizardry" archivesBaseName = "ElectroblobsWizardry"
@@ -63,7 +63,7 @@ public class Wizardry {
* 1.x.x represents Minecraft 1.7.x versions, 2.x.x represents Minecraft 1.10.x versions, 3.x.x represents Minecraft * 1.x.x represents Minecraft 1.7.x versions, 2.x.x represents Minecraft 1.10.x versions, 3.x.x represents Minecraft
* 1.11.x versions, and so on. * 1.11.x versions, and so on.
*/ */
public static final String VERSION = "4.2.4"; public static final String VERSION = "4.2.5";
// IDEA: Triggering of inbuilt Forge events in relevant places? // IDEA: Triggering of inbuilt Forge events in relevant places?
// IDEA: Abstract the vanilla particles behind the particle builder // IDEA: Abstract the vanilla particles behind the particle builder
@@ -392,7 +392,7 @@ public class EntityEvilWizard extends EntityMob implements ISpellCaster, IEntity
@SubscribeEvent @SubscribeEvent
public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){ public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){
// We have no way of checking if it's a spawner in getCanSpawnHere() so this has to be done here instead // We have no way of checking if it's a spawner in getCanSpawnHere() so this has to be done here instead
if(!event.isSpawner()){ if(event.getEntityLiving() instanceof EntityEvilWizard && !event.isSpawner()){
if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension())) if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension()))
event.setResult(Event.Result.DENY); event.setResult(Event.Result.DENY);
} }
@@ -197,7 +197,7 @@ public class EntityIceWraith extends EntityBlazeMinion {
@SubscribeEvent @SubscribeEvent
public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){ public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){
// We have no way of checking if it's a spawner in getCanSpawnHere() so this has to be done here instead // We have no way of checking if it's a spawner in getCanSpawnHere() so this has to be done here instead
if(!event.isSpawner()){ if(event.getEntityLiving() instanceof EntityLightningWraith && !event.isSpawner()){
if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension())) if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension()))
event.setResult(Event.Result.DENY); event.setResult(Event.Result.DENY);
} }
@@ -89,7 +89,7 @@ public class EntityLightningWraith extends EntityBlazeMinion {
@SubscribeEvent @SubscribeEvent
public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){ public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){
// We have no way of checking if it's a spawner in getCanSpawnHere() so this has to be done here instead // We have no way of checking if it's a spawner in getCanSpawnHere() so this has to be done here instead
if(!event.isSpawner()){ if(event.getEntityLiving() instanceof EntityLightningWraith && !event.isSpawner()){
if(!event.getWorld().isThundering()) event.setResult(Event.Result.DENY); if(!event.getWorld().isThundering()) event.setResult(Event.Result.DENY);
if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension())) if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension()))
event.setResult(Event.Result.DENY); event.setResult(Event.Result.DENY);
+1 -1
View File
@@ -2,7 +2,7 @@
{ {
"modid" : "ebwizardry", "modid" : "ebwizardry",
"name" : "Electroblob's Wizardry", "name" : "Electroblob's Wizardry",
"version" : "4.2.4", "version" : "4.2.5",
"mcversion" : "1.12.2", "mcversion" : "1.12.2",
"url" : "https://minecraft.curseforge.com/projects/electroblobs-wizardry", "url" : "https://minecraft.curseforge.com/projects/electroblobs-wizardry",
"credits" : "\nDesigned, coded and textured by Electroblob.\nCode contributed by: Corail31, 12foo, Shadows-of-Fire, Tora-B, Avatair, Aeronica.\nTranslators: MadWrist (Spanish, Mexican Spanish), VilagVil & kellixon (Russian), Hahdrim (French), lorrampi (Brazilian Portuguese), ZHENGLOC & dragon-evol (Chinese), shejery & rewi_wire (Korean), Trozuu (Polish).", "credits" : "\nDesigned, coded and textured by Electroblob.\nCode contributed by: Corail31, 12foo, Shadows-of-Fire, Tora-B, Avatair, Aeronica.\nTranslators: MadWrist (Spanish, Mexican Spanish), VilagVil & kellixon (Russian), Hahdrim (French), lorrampi (Brazilian Portuguese), ZHENGLOC & dragon-evol (Chinese), shejery & rewi_wire (Korean), Trozuu (Polish).",