diff --git a/src/engine/gameManager/ZergManager.java b/src/engine/gameManager/ZergManager.java index 5db40ec4..ab78e733 100644 --- a/src/engine/gameManager/ZergManager.java +++ b/src/engine/gameManager/ZergManager.java @@ -234,12 +234,12 @@ public class ZergManager { public static float getReducedZergMultiplier(PlayerCharacter source, PlayerCharacter target){ if(source.ZergMultiplier == 0.0f) { - if(Mine.getMine(source.mineAppliedID)._playerMemory.contains(source.getObjectUUID()) == false ){ + if(Mine.getMine(source.mineAppliedID) != null && Mine.getMine(source.mineAppliedID)._playerMemory.contains(source.getObjectUUID()) == false ){ source.ZergMultiplier = 1.0f; } } if(target.ZergMultiplier == 0.0f) { - if(Mine.getMine(source.mineAppliedID)._playerMemory.contains(target.getObjectUUID()) == false){ + if(Mine.getMine(target.mineAppliedID) != null && Mine.getMine(target.mineAppliedID)._playerMemory.contains(target.getObjectUUID()) == false){ target.ZergMultiplier = 1.0f; } } diff --git a/src/engine/objects/Mine.java b/src/engine/objects/Mine.java index ef2e6a78..8ee92916 100644 --- a/src/engine/objects/Mine.java +++ b/src/engine/objects/Mine.java @@ -776,6 +776,7 @@ public class Mine extends AbstractGameObject { } } for(Integer id : purge){ + PlayerCharacter.getPlayerCharacter(id).mineAppliedID = 0; _recentMemory.remove(id); } if(toRemove.isEmpty()){