Browse Source

zerg mechanic overhaul

lakebane-master
FatBoy-DOTC 10 months ago
parent
commit
feb23e63fe
  1. 4
      src/engine/gameManager/ZergManager.java
  2. 1
      src/engine/objects/Mine.java

4
src/engine/gameManager/ZergManager.java

@ -234,12 +234,12 @@ public class ZergManager {
public static float getReducedZergMultiplier(PlayerCharacter source, PlayerCharacter target){ public static float getReducedZergMultiplier(PlayerCharacter source, PlayerCharacter target){
if(source.ZergMultiplier == 0.0f) { 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; source.ZergMultiplier = 1.0f;
} }
} }
if(target.ZergMultiplier == 0.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; target.ZergMultiplier = 1.0f;
} }
} }

1
src/engine/objects/Mine.java

@ -776,6 +776,7 @@ public class Mine extends AbstractGameObject {
} }
} }
for(Integer id : purge){ for(Integer id : purge){
PlayerCharacter.getPlayerCharacter(id).mineAppliedID = 0;
_recentMemory.remove(id); _recentMemory.remove(id);
} }
if(toRemove.isEmpty()){ if(toRemove.isEmpty()){

Loading…
Cancel
Save