Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-24 11:38:26 +01:00
Code Issues Projects Releases Wiki Activity

Avoid using iterators where possible

Browse Source
This commit is contained in:
fullwall 2012-04-22 19:33:35 +08:00
parent bd563d646b
commit 433c438398
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/net/citizensnpcs/npc/ai/CitizensAI.java
View File

@ -2,7 +2,6 @@ package net.citizensnpcs.npc.ai;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator;
import java.util.List; import java.util.List;
import net.citizensnpcs.api.ai.AI; import net.citizensnpcs.api.ai.AI;
@ -41,11 +40,10 @@ public class CitizensAI implements AI {
if (executing == null) if (executing == null)
return; return;
executing = null; executing = null;
Iterator<WeakReference<NavigationCallback>> itr = callbacks.iterator(); for (int i = 0; i < callbacks.size(); ++i) {
while (itr.hasNext()) { NavigationCallback next = callbacks.get(i).get();
NavigationCallback next = itr.next().get();
if (next == null || next.onCancel(this, CancelReason.CANCEL)) { if (next == null || next.onCancel(this, CancelReason.CANCEL)) {
itr.remove(); callbacks.remove(i);
} }
} }
} }
@ -56,11 +54,12 @@ public class CitizensAI implements AI {
} }
private boolean isGoalAllowable(GoalEntry test) { private boolean isGoalAllowable(GoalEntry test) {
for (GoalEntry item : goals) { for (int i = 0; i < goals.size(); ++i) {
GoalEntry item = goals.get(i);
if (item == test) if (item == test)
continue; continue;
if (test.priority >= item.priority) { if (test.priority >= item.priority) {
if (executingGoals.contains(item) && !test.goal.isCompatibleWith(item.goal)) { if (!test.goal.isCompatibleWith(item.goal) && executingGoals.contains(item)) {
return false; return false;
} }
} /*else if (executingGoals.contains(item) && !item.goal.requiresUpdates()) { } /*else if (executingGoals.contains(item) && !item.goal.requiresUpdates()) {
@ -96,11 +95,11 @@ public class CitizensAI implements AI {
if (!replaced) if (!replaced)
return; return;
Iterator<WeakReference<NavigationCallback>> itr = callbacks.iterator();
while (itr.hasNext()) { for (int i = 0; i < callbacks.size(); ++i) {
NavigationCallback next = itr.next().get(); NavigationCallback next = callbacks.get(i).get();
if (next == null || (replaced && next.onCancel(this, CancelReason.REPLACE)) || next.onBegin(this)) { if (next == null || (replaced && next.onCancel(this, CancelReason.REPLACE)) || next.onBegin(this)) {
itr.remove(); callbacks.remove(i);
} }
} }
} }
@ -115,11 +114,10 @@ public class CitizensAI implements AI {
if (!replaced) if (!replaced)
return; return;
Iterator<WeakReference<NavigationCallback>> itr = callbacks.iterator(); for (int i = 0; i < callbacks.size(); ++i) {
while (itr.hasNext()) { NavigationCallback next = callbacks.get(i).get();
NavigationCallback next = itr.next().get();
if (next == null || (replaced && next.onCancel(this, CancelReason.REPLACE)) || next.onBegin(this)) { if (next == null || (replaced && next.onCancel(this, CancelReason.REPLACE)) || next.onBegin(this)) {
itr.remove(); callbacks.remove(i);
} }
} }
} }
@ -131,16 +129,16 @@ public class CitizensAI implements AI {
if (executing != null && executing.update()) { if (executing != null && executing.update()) {
executing = null; executing = null;
Iterator<WeakReference<NavigationCallback>> itr = callbacks.iterator(); for (int i = 0; i < callbacks.size(); ++i) {
while (itr.hasNext()) { NavigationCallback next = callbacks.get(i).get();
NavigationCallback next = itr.next().get();
if (next == null || next.onCompletion(this)) { if (next == null || next.onCompletion(this)) {
itr.remove(); callbacks.remove(i);
} }
} }
} }
for (GoalEntry entry : goals) { for (int i = 0; i < goals.size(); ++i) {
GoalEntry entry = goals.get(i);
boolean executing = executingGoals.contains(entry); boolean executing = executingGoals.contains(entry);
if (executing) { if (executing) {
@ -154,8 +152,8 @@ public class CitizensAI implements AI {
} }
} }
for (GoalEntry entry : executingGoals) { for (int i = 0; i < executingGoals.size(); ++i) {
entry.goal.update(); executingGoals.get(i).goal.update();
} }
} }