ChromaGaming/unconflicted-Hardcore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into Ali

Browse source
This commit is contained in:
alisolarflare 2016-10-22 21:06:28 -04:00
commit f09d00fd1a
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/iie/HelloWorldPlugin.java
View file

@ -28,25 +28,22 @@ public class HelloWorldPlugin extends JavaPlugin {
public static AbstractMap<String,String> deathMap = new HashMap<String,String>(); public static AbstractMap<String,String> deathMap = new HashMap<String,String>();
public void onEnable(){ public void onEnable(){
iie = Bukkit.getServer().getOfflinePlayer((UUID) UUID.fromString("633d0de1-4a67-46ff-bd8a-004fa8ce4858")).getPlayer();
board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); board = Bukkit.getServer().getScoreboardManager().getMainScoreboard();
if (board.getObjective("hardcoreTimeDead") != null){ //null check hardcoreTimeDead if (board.getObjective("hardcoreTimeDead") != null) //null check hardcoreTimeDead
hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); hardcoreTimeDead = board.getObjective("hardcoreTimeDead");
}else{ else
hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy");
}
if (board.getObjective("hardcoreInvite") != null){ //null check hardcoreInvite if (board.getObjective("hardcoreInvite") != null) //null check hardcoreInvite
hardcoreInvite = board.getObjective("hardcoreInvite"); hardcoreInvite = board.getObjective("hardcoreInvite");
}else{ else
hardcoreInvite = board.registerNewObjective("hardcoreInvite", "dummy"); hardcoreInvite = board.registerNewObjective("hardcoreInvite", "dummy");
}
if (board.getObjective("hardcoreOutBound") != null){ //null check hardcoreOutBound if (board.getObjective("hardcoreOutBound") != null) //null check hardcoreOutBound
hardcoreOutBound = board.getObjective("hardcoreOutBound"); hardcoreOutBound = board.getObjective("hardcoreOutBound");
}else{ else
hardcoreOutBound = board.registerNewObjective("hardcoreOutBound", "dummy"); hardcoreOutBound = board.registerNewObjective("hardcoreOutBound", "dummy");
}
registerCommands(); registerCommands();
getServer().getPluginManager().registerEvents(new JoinListener(this), this); getServer().getPluginManager().registerEvents(new JoinListener(this), this);