Fixed portable radar crash in v1.7.4.

Geforce132 · Apr 13, 2015 · 37b3cf1 · 37b3cf1
1 parent 494b3a0
commit 37b3cf1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/1.7.10/src/main/java/org/freeforums/geforce/securitycraft/blocks/BlockPortableRadar.java b/1.7.10/src/main/java/org/freeforums/geforce/securitycraft/blocks/BlockPortableRadar.java
@@ -89,7 +89,7 @@ public void addEffectsToPlayers(World par1World, int par2, int par3, int par4){
 
                 entityplayer = (EntityPlayer)iterator.next();
 
-                if(HelpfulMethods.getPlayersFromModule(par1World, par2, par3, par4, EnumCustomModules.WHITELIST).contains(entityplayermp.getCommandSenderName().toLowerCase())){ continue; }              
+                if(((CustomizableSCTE) par1World.getTileEntity(par2, par3, par4)).hasModule(EnumCustomModules.WHITELIST) && HelpfulMethods.getPlayersFromModule(par1World, par2, par3, par4, EnumCustomModules.WHITELIST).contains(entityplayermp.getCommandSenderName().toLowerCase())){ continue; }              
 
                 if(this.isOwnerOnline(((TileEntityPortableRadar)par1World.getTileEntity(par2, par3, par4)).getUsername())){
                 	if(!((TileEntityPortableRadar)par1World.getTileEntity(par2, par3, par4)).isEmped()){

diff --git a/1.7.10/src/main/java/org/freeforums/geforce/securitycraft/main/mod_SecurityCraft.java b/1.7.10/src/main/java/org/freeforums/geforce/securitycraft/main/mod_SecurityCraft.java
@@ -47,8 +47,8 @@ public class mod_SecurityCraft {
 	private static final String MOTU = "Thanks for all your suggestions!";
 
 	//TODO UPDATE 'RECIPES' and 'HELP' ArrayList's.
-	//TODO ********************************* This is v1.7.4 for MC 1.7.10!
-	protected static final String VERSION = "v1.7.4";
+	//TODO ********************************* This is v1.7.4.1 for MC 1.7.10!
+	protected static final String VERSION = "v1.7.4.1";
 	protected static final String FORGEVERSION = "required-after:Forge@[10.13.0.1180,)";
 
 

diff --git a/1.8/src/main/java/org/freeforums/geforce/securitycraft/blocks/BlockPortableRadar.java b/1.8/src/main/java/org/freeforums/geforce/securitycraft/blocks/BlockPortableRadar.java
@@ -97,8 +97,7 @@ public void addEffectsToPlayers(World par1World, BlockPos pos, IBlockState state
 
                 entityplayer = (EntityPlayer)iterator.next();
 
-                System.out.println(((TileEntityPortableRadar)par1World.getTileEntity(pos)).getUsername());
-                if(entityplayermp != null && HelpfulMethods.getPlayersFromModule(par1World, pos, EnumCustomModules.WHITELIST).contains(entityplayermp.getName().toLowerCase())){ continue; }              
+                if(entityplayermp != null && ((CustomizableSCTE) par1World.getTileEntity(pos)).hasModule(EnumCustomModules.WHITELIST) && HelpfulMethods.getPlayersFromModule(par1World, pos, EnumCustomModules.WHITELIST).contains(entityplayermp.getName().toLowerCase())){ continue; }              
 
                 if(this.isOwnerOnline(((TileEntityPortableRadar)par1World.getTileEntity(pos)).getUsername())){
                 	HelpfulMethods.sendMessageToPlayer(entityplayermp, ((TileEntityPortableRadar)par1World.getTileEntity(pos)).hasCustomName() ? (EnumChatFormatting.ITALIC + entityplayer.getName() + EnumChatFormatting.RESET +" is near your portable radar named " + EnumChatFormatting.ITALIC + ((TileEntityPortableRadar)par1World.getTileEntity(pos)).getCustomName() + EnumChatFormatting.RESET + ".") : (EnumChatFormatting.ITALIC + entityplayer.getName() + EnumChatFormatting.RESET + " is near a portable radar (at " + Utils.getFormattedCoordinates(pos) + ")."), null);               

diff --git a/1.8/src/main/java/org/freeforums/geforce/securitycraft/main/mod_SecurityCraft.java b/1.8/src/main/java/org/freeforums/geforce/securitycraft/main/mod_SecurityCraft.java
@@ -46,7 +46,7 @@ public class mod_SecurityCraft {
 
 	//TODO UPDATE 'RECIPES' and 'HELP' ArrayList's.
 	//TODO ********************************* This is v1.7.4 for MC 1.8!
-	protected static final String VERSION = "v1.7.4";
+	protected static final String VERSION = "v1.7.4.1";
 	protected static final String FORGEVERSION = "required-after:Forge@[11.14.0.1252,)";