From cfe135e46526fc39db9ffe89d6d0b20eb010140b Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Wed, 1 Jun 2011 20:50:20 +0200 Subject: [PATCH] fix --- MobArena.jar | Bin 30099 -> 30090 bytes .../garbagemule/MobArena/MASpawnThread.java | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MobArena.jar b/MobArena.jar index 59ec769126ebefdfcf2db248773f0934e071c8f5..a2d909a373f0657877f987c7268908d6db6a77b1 100644 GIT binary patch delta 3366 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 delta 3409 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 ZMp2wHf(@q~DoeA6dk`wd(B)6{{15eXQf>eM diff --git a/src/com/garbagemule/MobArena/MASpawnThread.java b/src/com/garbagemule/MobArena/MASpawnThread.java index 3cb8417..539c90e 100644 --- a/src/com/garbagemule/MobArena/MASpawnThread.java +++ b/src/com/garbagemule/MobArena/MASpawnThread.java @@ -50,14 +50,14 @@ public class MASpawnThread implements Runnable } public void run() - { + { // Check if we need to grant more rewards with the recurrent waves. for (Integer i : ArenaManager.everyWaveMap.keySet()) { if (wave % i != 0) continue; - for (Player p : playerList) + for (Player p : ArenaManager.playerSet) { currentRewards = ArenaManager.rewardMap.get(p); reward = MAUtils.getRandomReward(ArenaManager.everyWaveMap.get(i)); @@ -70,7 +70,7 @@ public class MASpawnThread implements Runnable // Same deal, this time with the one-time waves. if (ArenaManager.afterWaveMap.containsKey(wave)) { - for (Player p : playerList) + for (Player p : ArenaManager.playerSet) { currentRewards = ArenaManager.rewardMap.get(p); reward = MAUtils.getRandomReward(ArenaManager.afterWaveMap.get(wave));