Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-29 14:05:25 +01:00
Code Issues Projects Releases Wiki Activity

Use iterraation to prevent concurrent modification error

Browse Source
This commit is contained in:
Zrips 2017-01-14 15:20:01 +02:00
parent 0870a3abe2
commit 1af4c554b3
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
com/gamingmesh/jobs/Jobs.java
View File

@ -23,6 +23,7 @@ import java.io.IOException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.UUID; import java.util.UUID;
@ -468,7 +469,9 @@ public class Jobs extends JavaPlugin {
int y = 0; int y = 0;
int total = Jobs.getPlayerManager().getMapSize(); int total = Jobs.getPlayerManager().getMapSize();
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
for (Entry<UUID, PlayerInfo> one : Jobs.getPlayerManager().getPlayersInfoUUIDMap().entrySet()) { Iterator<Entry<UUID, PlayerInfo>> it = Jobs.getPlayerManager().getPlayersInfoUUIDMap().entrySet().iterator();
while (it.hasNext()) {
Entry<UUID, PlayerInfo> one = it.next();
if (!running) if (!running)
return; return;
try { try {

1
com/gamingmesh/jobs/PlayerManager.java
View File

@ -629,7 +629,6 @@ public class PlayerManager {
} }
public BoostMultiplier getBoost(JobsPlayer player, Job job, boolean force) { public BoostMultiplier getBoost(JobsPlayer player, Job job, boolean force) {
Debug.D("getting boost");
BoostMultiplier b = new BoostMultiplier(); BoostMultiplier b = new BoostMultiplier();
for (CurrencyType one : CurrencyType.values()) { for (CurrencyType one : CurrencyType.values()) {
b.add(one, getBoost(player, job, one, force)); b.add(one, getBoost(player, job, one, force));

10
com/gamingmesh/jobs/container/JobsPlayer.java
View File

@ -203,12 +203,9 @@ public class JobsPlayer {
public double getBoost(String JobName, CurrencyType type, boolean force) { public double getBoost(String JobName, CurrencyType type, boolean force) {
double Boost = 0D; double Boost = 0D;
Debug.D("1 "+this.isOnline());
if (!this.isOnline()) if (!this.isOnline())
return Boost; return Boost;
Debug.D("4 ");
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
if (this.boostCounter.containsKey(JobName)) { if (this.boostCounter.containsKey(JobName)) {
@ -243,15 +240,14 @@ public class JobsPlayer {
Double v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + JobName + "." + type.getName().toLowerCase(), true); Double v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + JobName + "." + type.getName().toLowerCase(), true);
Boost = v1; Boost = v1;
v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + JobName + ".all"); v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + JobName + ".all");
if (Boost == null ||v1 != null && v1 > Boost) if (Boost == null || v1 != null && v1 > Boost)
Boost = v1; Boost = v1;
v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all.all"); v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all.all");
if (Boost == null ||v1 != null && v1 > Boost) if (Boost == null || v1 != null && v1 > Boost)
Boost = v1; Boost = v1;
v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all." + type.getName().toLowerCase()); v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all." + type.getName().toLowerCase());
if (Boost == null ||v1 != null &&v1 > Boost) if (Boost == null || v1 != null && v1 > Boost)
Boost = v1; Boost = v1;
Debug.D("bonus " + Boost);
return Boost == null ? 0D : Boost; return Boost == null ? 0D : Boost;
} }