MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

zerg mechanic overhaul

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-03-01 19:41:34 -06:00
parent ab5943e4b2
commit feb23e63fe
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/ZergManager.java
+2 -2
View File
@@ -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;
} }
} }
src/engine/objects/Mine.java
+1
View File
@@ -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()){