Skip to content

Commit

Permalink
0.9.3 :D
Browse files Browse the repository at this point in the history
  • Loading branch information
aufdemrand committed Oct 6, 2013
1 parent 0e34e71 commit 7f2506b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -7,7 +7,7 @@
<groupId>net.aufdemrand</groupId>
<artifactId>denizen</artifactId>
<packaging>jar</packaging>
<version>0.9.2-SNAPSHOT</version>
<version>0.9.3-SNAPSHOT</version>
<name>Denizen</name>
<description>Scriptable NPCs for Citizens2</description>

Expand Down
26 changes: 13 additions & 13 deletions src/main/java/net/aufdemrand/denizen/Denizen.java
Expand Up @@ -50,9 +50,9 @@
public class Denizen extends JavaPlugin {
public final static int configVersion = 4;
public static String versionTag = null;

private boolean startedSuccessful = false;


private CommandHandler commandHandler;

public CommandHandler getCommandHandler() {
Expand Down Expand Up @@ -104,7 +104,6 @@ public TriggerRegistry getTriggerRegistry() {
/*
* Denizen Managers
*/

private FlagManager flagManager = new FlagManager(this);
private TagManager tagManager = new TagManager(this);
private NotableManager notableManager = new NotableManager();
Expand All @@ -121,14 +120,12 @@ public NotableManager notableManager() {
return notableManager;
}



public Depends depends = new Depends();


/*
* Sets up Denizen on start of the craftbukkit server.
*/

@Override
public void onEnable() {
// Activate dependencies
Expand Down Expand Up @@ -232,8 +229,6 @@ public void onEnable() {

dB.echoDebug(DebugElement.Footer);



try {
// Initialize the ObjectFetcher
ObjectFetcher.registerWithObjectFetcher(dItem.class); // i@
Expand All @@ -256,21 +251,21 @@ public void onEnable() {
NotableManager.registerWithObjectFetcher(dCuboid.class); // cuboid
NotableManager._initialize();

} catch (IOException e) {
//
} catch (ClassNotFoundException e) {
//
} catch (Exception e) {
// Shit!
}

// Initialize non-standard dMaterials
dMaterial._initialize();

// Fire the 'on Server Start' world event
ws_helper.serverStartEvent();
}


/*
* Unloads Denizen on shutdown of the craftbukkit server.
*/

@Override
public void onDisable() {
if(!startedSuccessful) return;
Expand Down Expand Up @@ -299,10 +294,10 @@ public void onDisable() {
saveSaves();
}


/*
* Reloads, retrieves and saves progress information Denizen/saves.yml.
*/

private FileConfiguration savesConfig = null;
private File savesConfigFile = null;

Expand Down Expand Up @@ -337,13 +332,18 @@ public void saveSaves() {
}
}


/*
* Use Citizens' Command API to handle commands
*/
Citizens citizens;

@Override
public boolean onCommand(CommandSender sender, Command cmd, String cmdName, String[] args) {
if (citizens == null)
citizens = (Citizens) getServer().getPluginManager().getPlugin("Citizens");

// ...except this one :) /ex command
if (cmdName.equalsIgnoreCase("ex")) {
List<String> entries = new ArrayList<String>();
String entry = "";
Expand Down

0 comments on commit 7f2506b

Please sign in to comment.