Threading, NPE fixes

Signed-off-by: Robert Xu <robxu9@gmail.com>
Minequest · May 2, 2012 · 06f6921 · 06f6921
1 parent 5c1170c
commit 06f6921
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/com/theminequest/MineQuest/EventsAPI/EventManager.java b/src/main/java/com/theminequest/MineQuest/EventsAPI/EventManager.java
@@ -176,13 +176,15 @@ public void rmEventListener(QEvent e){
 	}
 
 	public void checkAllEvents(){
-		for (final QEvent e : activeevents){
-			new Thread(new Runnable(){
-				@Override
-				public void run() {
-					e.check();
-				}
-			}).start();
+		synchronized(classlistlock){
+			for (final QEvent e : activeevents){
+				new Thread(new Runnable(){
+					@Override
+					public void run() {
+						e.check();
+					}
+				}).start();
+			}
 		}
 	}
 

diff --git a/src/main/java/com/theminequest/MineQuest/Group/Team.java b/src/main/java/com/theminequest/MineQuest/Group/Team.java
@@ -126,6 +126,8 @@ public synchronized void startQuest(String q) throws GroupException {
 			abandonQuest();
 			throw new GroupException(GroupReason.BADCAPACITY);
 		}
+		if (!quest.details.loadworld)
+			quest.startQuest();
 		QuestStartedEvent event = new QuestStartedEvent(quest);
 		Bukkit.getPluginManager().callEvent(event);
 	}

diff --git a/src/main/java/com/theminequest/MineQuest/Quest/QuestManager.java b/src/main/java/com/theminequest/MineQuest/Quest/QuestManager.java
@@ -150,8 +150,6 @@ public long startQuest(String id){
 			throw new RuntimeException(e);
 		}
 		quests.put(questid,new Quest(questid,d));
-		if (!quests.get(questid).details.loadworld)
-			quests.get(questid).startQuest();
 		long thisquestid = questid;
 		questid++;
 		return thisquestid;