Should fix TagAPI freezing.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
MinimallyCorrect · Jul 18, 2013 · 7b46bab · 7b46bab
1 parent ac2b80d
commit 7b46bab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/resources/patches-deobfuscated.xml b/resources/patches-deobfuscated.xml
@@ -2181,4 +2181,9 @@
 			<replaceNew oldClass="java.util.LinkedList" newClass="nallar.collections.ConcurrentLinkedQueueList">queueChunkCoords</replaceNew>
 		</class>
 	</magicBees>
+	<tagApi>
+		<class id="org.kitteh.tag.TagAPI">
+			<replaceMethodCall method="equals" code="$_ = false;" index="0">getName,check</replaceMethodCall>
+		</class>
+	</tagApi>
 </mods>
diff --git a/src/common/nallar/tickthreading/util/LocationUtil.java b/src/common/nallar/tickthreading/util/LocationUtil.java
@@ -105,6 +105,10 @@ private static File getModsDirectory() {
 		return new File(getServerDirectory(), "mods");
 	}
 
+	private static File getPluginsDirectory() {
+		return new File(getServerDirectory(), "plugins");
+	}
+
 	public static List<File> getJarLocations() {
 		List<File> jarLocations = new ArrayList<File>();
 		File forgeJar = locationOf(net.minecraft.server.MinecraftServer.class);
@@ -117,6 +121,7 @@ public static List<File> getJarLocations() {
 		jarLocations.add(minecraftJar);
 		jarLocations.add(getCoreModsDirectory());
 		jarLocations.add(getModsDirectory());
+		jarLocations.add(getPluginsDirectory());
 		return jarLocations;
 	}
 }