$ Fixed Null Pointers if Tesseracts are broken too fast after placement.

% Tweaked power usage from EV -> HV.

3 files changed, 30 insertions, 6 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
index cab4b2de0b..3955ae8c9f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
@@ -27,6 +27,9 @@ public class TesseractHelper {
 	//Checks if a Generator is owned by a player.
 	public final static boolean isGeneratorOwnedByPlayer(EntityPlayer player,
 			GT_MetaTileEntity_TesseractGenerator generator) {
+		if (player == null){
+			return false;
+		}
 		UUID playerIdentifier = player.getUniqueID();
 		if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
 			Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
@@ -45,6 +48,9 @@ public class TesseractHelper {
 	//Saves A Generator to the Players UUID map along with the Freq.
 	public final static boolean setGeneratorOwnershipByPlayer(EntityPlayer player, int freq,
 			GT_MetaTileEntity_TesseractGenerator generator) {
+		if (player == null){
+			return false;
+		}
 		UUID playerIdentifier = player.getUniqueID();
 		Utils.LOG_INFO("Setting Generator on "+freq+" for "+player.getDisplayName()+".");
 		if (playerIdentifier != null) {
@@ -72,6 +78,9 @@ public class TesseractHelper {
 	//Gets Generator based on Frequency.
 	public final static GT_MetaTileEntity_TesseractGenerator getGeneratorByFrequency(EntityPlayer player,
 			int freq) {
+		if (player == null){
+			return null;
+		}
 		UUID playerIdentifier = player.getUniqueID();
 		Utils.LOG_INFO("Getting Generator on "+freq+" for "+player.getDisplayName()+".");
 		if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
@@ -92,6 +101,9 @@ public class TesseractHelper {
 
 	//Remove Tesseract Generator
 	public final static boolean removeGenerator(EntityPlayer player, int frequency) {
+		if (player == null){
+			return false;
+		}
 		UUID playerIdentifier = player.getUniqueID();
 		if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
 			sTesseractGeneratorOwnershipMap.get(playerIdentifier).remove(frequency);
@@ -111,6 +123,9 @@ public class TesseractHelper {
 	//Checks if a Terminal is owned by a player.
 	public final static boolean isTerminalOwnedByPlayer(EntityPlayer player,
 			GT_MetaTileEntity_TesseractTerminal generator) {
+		if (player == null){
+			return false;
+		}
 		UUID playerIdentifier = player.getUniqueID();
 		if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
 			Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
@@ -129,6 +144,9 @@ public class TesseractHelper {
 	//Saves A Terminal to the Players UUID map along with the Freq.
 	public final static boolean setTerminalOwnershipByPlayer(EntityPlayer player, int freq,
 			GT_MetaTileEntity_TesseractTerminal generator) {
+		if (player == null){
+			return false;
+		}
 		UUID playerIdentifier = player.getUniqueID();
 		if (playerIdentifier != null) {
 			Utils.LOG_INFO("Setting Terminal on "+freq+" for "+player.getDisplayName()+".");
@@ -156,6 +174,9 @@ public class TesseractHelper {
 	//Gets Terminal based on Frequency.
 	public final static GT_MetaTileEntity_TesseractTerminal getTerminalByFrequency(EntityPlayer player,
 			int freq) {
+		if (player == null){
+			return null;
+		}
 		UUID playerIdentifier = player.getUniqueID();
 		Utils.LOG_INFO("Getting Terminal on "+freq+" for "+player.getDisplayName()+".");
 		if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
@@ -176,6 +197,9 @@ public class TesseractHelper {
 
 	//Remove Tesseract Terminal
 	public final static boolean removeTerminal(EntityPlayer player, int frequency) {
+		if (player == null){
+			return false;
+		}
 		UUID playerIdentifier = player.getUniqueID();
 		if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
 			sTesseractTerminalOwnershipMap.get(playerIdentifier).remove(frequency);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
index 313b7049e3..b017cce0db 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
@@ -115,7 +115,7 @@ extends GT_MetaTileEntity_BasicTank
 	@Override
 	public long maxEUInput()
 	{
-		return 2048;
+		return 512;
 	}
 
 	@Override
@@ -127,7 +127,7 @@ extends GT_MetaTileEntity_BasicTank
 	@Override
 	public long maxEUStore()
 	{
-		return 100000;
+		return 512*32;
 	}
 
 	@Override
@@ -211,7 +211,7 @@ extends GT_MetaTileEntity_BasicTank
 				break;
 			}
 			PlayerUtils.messagePlayer(aPlayer, "Frequency: " + this.mFrequency);
-			PlayerUtils.messagePlayer(aPlayer, ((getGeneratorEntity() != null) && (getGeneratorEntity() != this)) ? EnumChatFormatting.RED + " (Occupied)" : "");
+			PlayerUtils.messagePlayer(aPlayer, ((getGeneratorEntity(this.mFrequency) != null) && (getGeneratorEntity(this.mFrequency) != this)) ? EnumChatFormatting.RED + " (Occupied)" : "");
 		}
 		return true;
 	}
@@ -236,7 +236,7 @@ extends GT_MetaTileEntity_BasicTank
 			case 3:
 				this.mFrequency += 512;
 			}
-			GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency + ((getGeneratorEntity() != null && getGeneratorEntity() != this) ? EnumChatFormatting.RED + " (Occupied)" : ""));
+			GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + this.mFrequency + ((getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this) ? EnumChatFormatting.RED + " (Occupied)" : ""));
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
index b378654fd5..f231c21a93 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
@@ -88,7 +88,7 @@ extends GT_MetaTileEntity_BasicTank
 	@Override
 	public long maxEUInput()
 	{
-		return 2048;
+		return 512;
 	}
 
 	@Override
@@ -100,7 +100,7 @@ extends GT_MetaTileEntity_BasicTank
 	@Override
 	public long maxEUStore()
 	{
-		return 100000;
+		return 512*32;
 	}
 
 	@Override