From e1d3cd4f313c5326953103be1eb41fb299a07cf7 Mon Sep 17 00:00:00 2001
From: aPunch <alexpuncochar@yahoo.com>
Date: Sat, 14 Jan 2012 23:09:31 -0600
Subject: [PATCH] go back go back go back, go back to where we were

---
 lib/CitizensAPI.jar                | Bin 13392 -> 13365 bytes
 src/net/citizensnpcs/Citizens.java |  11 ++---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar
index 264c07ee147f473323dbce1fe0f8e8714de73a5a..065dc1123d1846b519e50ad57c2b85edf845f1a6 100644
GIT binary patch
delta 733
zcmcbRu{DDyz?+$civbLFPUO*K`nzMJxd5x+-yM1m9L);SU5pG2cbOO%)FwN!E7Us%
zc<LqRBo-I<2A=d{b`+?c>$9zJQ`Vhw!DK$Z3R4atffk8Yj|0i+IZ4NFaL&Bg9G@D)
zp;00FM`L4^QHF@)^MKI5&-R9g-pzmSug|b;V}?@KOctIquMETw@A0fuYh!KO5wh<1
zRAq@UZLf-L%C?otQ&#Wl%l^D>%W1|9<u&yi4krlJoe<6Mk~{qCJ(t#-SA~`fCTc`Y
z@~Ya+^YBpG+=CkB=T^k;QkuFVF4oNDeT(_6mM2=W?b~1PQU7Ym!23RC7thIMANKi3
znsLqk|7Kpver@j7dd{y)PR=?$x7+z1Z(8T{Ib|EVB45XRmD#9oI!|)vlC@&{pNSny
zi0n|zQ><s4ocMG7ZdGC3Ew^J#-!69ZwvY>ZF>}$EHpMep+WVEvPqEE-=V0imKHF%q
zj3(cKUv|2#hOe3nmuN;gGa2pkWr}>l^l{RE_Kv%XUm8B>PR((dr}W7}jj5=0jp;1e
zN%4t6fi*4><-ET)iKI^0JuP*D{L6W~ZRdZ-EOVdv=T2g;*qpEC-*_IEG@P(?`YXR!
zMZ@psZQpu^&1&qqicAbUCr{O|1jgUy3mR$6yeJVk*;yx*iJN`$L`Lz+3d|gnPwJR4
zKAxoO&v<fjfNnICBiH0WUD?T}bnTh0aD$l|dKQc`CMW7eGA-r@3*6MRW%?-yG(d5(
zrM@FmsW6y1SKo%|i^$}ITGErh=^Hb>5Cb!<#04hH8uCm|GLU0zo!n>;&zLs(p+Oo`
zuoPH&o)ORF0z(s~Olc@rbn*phw#j!4wV0;JK!s!{I~X}KRmelRzD#+FlNTB*PUbVV
mWU5sHGSw#M8yhgTO<rIe$8=Z)EGMlhIoZlYfGtM@l$rrSUL#5X

delta 781
zcmdm*aUp{zz?+$civa|#ZkfoV$#iAQMsopHL6=xv2W9(@?MoRM7#=Y(FsMy#l$4lU
zz$#qtn|<3spf>yDwA_>OrH_}%=RFqjnku7p!c;ZEhl|ae(?X&uM!S2{x=li#c5V3^
z>RZjBGT~m)iGD8GlUm<anl{~>xxDi8y*KylW9~EEI9w(wHZL^bP%*dusTU!M50<uu
zi*1uQweQNO-2ujJ=FX~HzHblPX#crFXKx+foR-fHtLkgpE>*8wVwYfWXRcxM&Hi&N
z&dC~6EoR00xD=gIS5#b^_~diJ8R41NEHhpedq%DQzxJxN<b(;b9JT?*XQ%p~+5Ya_
zEVj2dwa%AbU$k`flt()0D|$`7+t)uSe7DQ0>shD1-H9z3>vq(bKaJnftd+x_8j`V5
z<b%^XrhI`mr3Z=n^_<Vdon9VZzprC!PsX0Jhh08w&W|;kHEB1`-T!ylU+THb`!73m
zohP?^2aCJaM6Cs`8+`k7FFv09@rr1w+qByvva4*YB<CKztG&V7i)%%oPU?b2E7$ak
z4Q#VY!ai`Uopa~pKZa-iB6TTB-s@cF_HUe6J}+&P!)&Yf0lOPNu1t+nTlk~;yExbM
znIT@e2bW}A=4d~X<+6T#M8@Umc^^_Xx=ucD_RPo2_M5rca}}AcZkb%AVF`@W&096n
zn0Zkmb+U#|Dw7)f<cW;plNFdbCa=>mWBLc-{?##OdcrYzp`PsIU|n0rn8_1$W0~G_
z0|gW&3+S0LZRQ0t)AcME_f1})7tJIh1T;o*vYfsn<Alix`f*JBqLUX&NKd}4Z_LCj
z4ra=W3rw~)&|+F30pyxYo(*I+N&=aBlQ&560%dq6^BKx9<w=1RFOcS$9BOF7)FKV#
zN>4s$sKvBi2Fewk{6I#2vW<}z(`0!hA&$ulj0_k%Ctoy*W}2Y{l9*(|Hre0Ulxd+d
Xg2y^}jj=h?Jr#(EK3ls6DD?vXMLt3k

diff --git a/src/net/citizensnpcs/Citizens.java b/src/net/citizensnpcs/Citizens.java
index b80364950..ba08480ad 100644
--- a/src/net/citizensnpcs/Citizens.java
+++ b/src/net/citizensnpcs/Citizens.java
@@ -1,13 +1,11 @@
 package net.citizensnpcs;
 
 import net.citizensnpcs.api.CitizensAPI;
-import net.citizensnpcs.api.CitizensPlugin;
-import net.citizensnpcs.api.npc.NPCManager;
 import net.citizensnpcs.npc.CitizensNPCManager;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-public class Citizens extends JavaPlugin implements CitizensPlugin {
+public class Citizens extends JavaPlugin {
 
 	@Override
 	public void onDisable() {
@@ -15,11 +13,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
 
 	@Override
 	public void onEnable() {
-		CitizensAPI.setInstance(this);
-	}
-
-	@Override
-	public NPCManager getNPCManager() {
-		return new CitizensNPCManager();
+		CitizensAPI.setNPCManager(new CitizensNPCManager());
 	}
 }
\ No newline at end of file