diff --git a/src/net/theprogrammersworld/herobrine/AI/cores/Graveyard.java b/src/net/theprogrammersworld/herobrine/AI/cores/Graveyard.java index b251606..a0e78cc 100644 --- a/src/net/theprogrammersworld/herobrine/AI/cores/Graveyard.java +++ b/src/net/theprogrammersworld/herobrine/AI/cores/Graveyard.java @@ -36,7 +36,7 @@ public class Graveyard extends Core { public CoreResult Teleport(Player player) { if (Herobrine.getPluginCore().getConfigDB().UseGraveyardWorld == true) { if (!Herobrine.getPluginCore().getAICore().checkAncientSword(player.getInventory())) { - LivingEntities = Bukkit.getServer().getWorld("world_herobrineai_graveyard").getLivingEntities(); + LivingEntities = Bukkit.getServer().getWorld("world_herobrine_graveyard").getLivingEntities(); for (int i = 0; i <= LivingEntities.size() - 1; i++) { if (LivingEntities.get(i) instanceof Player || LivingEntities.get(i).getEntityId() == PluginCore.HerobrineEntityID) { @@ -48,7 +48,7 @@ public class Graveyard extends Core { } - Bukkit.getServer().getWorld("world_herobrineai_graveyard").setTime(15000); + Bukkit.getServer().getWorld("world_herobrine_graveyard").setTime(15000); AICore.PlayerTarget = player; Location loc = (Location) player.getLocation(); savedX = loc.getX(); @@ -56,7 +56,7 @@ public class Graveyard extends Core { savedZ = loc.getZ(); savedWorld = loc.getWorld(); savedPlayer = player; - loc.setWorld(Bukkit.getServer().getWorld("world_herobrineai_graveyard")); + loc.setWorld(Bukkit.getServer().getWorld("world_herobrine_graveyard")); loc.setX(-2.49); loc.setY(4); loc.setZ(10.69); @@ -67,7 +67,7 @@ public class Graveyard extends Core { Start(); AICore.isTarget = true; - Bukkit.getServer().getWorld("world_herobrineai_graveyard").setStorm(false); + Bukkit.getServer().getWorld("world_herobrine_graveyard").setStorm(false); return new CoreResult(true, "Player successfully teleported!"); } else { @@ -80,7 +80,7 @@ public class Graveyard extends Core { public void Start() { ticks = 0; - PluginCore.HerobrineNPC.moveTo(new Location(Bukkit.getServer().getWorld("world_herobrineai_graveyard"), -2.49, 4, -4.12)); + PluginCore.HerobrineNPC.moveTo(new Location(Bukkit.getServer().getWorld("world_herobrine_graveyard"), -2.49, 4, -4.12)); HandlerInterval(); } @@ -96,7 +96,7 @@ public class Graveyard extends Core { public void Handler() { - LivingEntities = Bukkit.getServer().getWorld("world_herobrineai_graveyard").getLivingEntities(); + LivingEntities = Bukkit.getServer().getWorld("world_herobrine_graveyard").getLivingEntities(); for (int i = 0; i <= LivingEntities.size() - 1; i++) { if (LivingEntities.get(i) instanceof Player @@ -111,7 +111,7 @@ public class Graveyard extends Core { if (savedPlayer.isDead() == true || savedPlayer.isOnline() == false - || savedPlayer.getLocation().getWorld() != Bukkit.getServer().getWorld("world_herobrineai_graveyard") + || savedPlayer.getLocation().getWorld() != Bukkit.getServer().getWorld("world_herobrine_graveyard") || this.ticks == 90 || AICore.isTarget == false) { if (AICore.PlayerTarget == savedPlayer) { @@ -126,27 +126,27 @@ public class Graveyard extends Core { PluginCore.HerobrineNPC.lookAtPoint(ploc); if (ticks == 1) { PluginCore.HerobrineNPC.moveTo( - new Location(Bukkit.getServer().getWorld("world_herobrineai_graveyard"), -2.49, 4, -4.12)); + new Location(Bukkit.getServer().getWorld("world_herobrine_graveyard"), -2.49, 4, -4.12)); } else if (ticks == 40) { PluginCore.HerobrineNPC.moveTo( - new Location(Bukkit.getServer().getWorld("world_herobrineai_graveyard"), -2.49, 4, -0.5)); + new Location(Bukkit.getServer().getWorld("world_herobrine_graveyard"), -2.49, 4, -0.5)); } else if (ticks == 60) { PluginCore.HerobrineNPC.moveTo( - new Location(Bukkit.getServer().getWorld("world_herobrineai_graveyard"), -2.49, 4, 5.1)); + new Location(Bukkit.getServer().getWorld("world_herobrine_graveyard"), -2.49, 4, 5.1)); } else if (ticks == 84) { PluginCore.HerobrineNPC.moveTo( - new Location(Bukkit.getServer().getWorld("world_herobrineai_graveyard"), -2.49, 4, 7.5)); + new Location(Bukkit.getServer().getWorld("world_herobrine_graveyard"), -2.49, 4, 7.5)); } Random randomGen = Utils.getRandomGen(); if (randomGen.nextInt(4) == 1) { - Location newloc = new Location(Bukkit.getServer().getWorld("world_herobrineai_graveyard"), + Location newloc = new Location(Bukkit.getServer().getWorld("world_herobrine_graveyard"), (double) randomGen.nextInt(400), (double) Utils.getRandomGen().nextInt(20) + 20, (double) randomGen.nextInt(400)); - Bukkit.getServer().getWorld("world_herobrineai_graveyard").strikeLightning(newloc); + Bukkit.getServer().getWorld("world_herobrine_graveyard").strikeLightning(newloc); } ticks++; HandlerInterval(); diff --git a/src/net/theprogrammersworld/herobrine/AI/extensions/GraveyardWorld.java b/src/net/theprogrammersworld/herobrine/AI/extensions/GraveyardWorld.java index 27d7a7f..5ad11ca 100644 --- a/src/net/theprogrammersworld/herobrine/AI/extensions/GraveyardWorld.java +++ b/src/net/theprogrammersworld/herobrine/AI/extensions/GraveyardWorld.java @@ -11,7 +11,7 @@ public class GraveyardWorld { public static void Create() { - Location loc = new Location(Bukkit.getServer().getWorld("world_herobrineai_graveyard"), 0, 3, 0); + Location loc = new Location(Bukkit.getServer().getWorld("world_herobrine_graveyard"), 0, 3, 0); for (int x = -50; x <= 50; x++) { for (int z = -50; z <= 50; z++) { diff --git a/src/net/theprogrammersworld/herobrine/ConfigDB.java b/src/net/theprogrammersworld/herobrine/ConfigDB.java index 6fa7128..82da77e 100644 --- a/src/net/theprogrammersworld/herobrine/ConfigDB.java +++ b/src/net/theprogrammersworld/herobrine/ConfigDB.java @@ -163,12 +163,12 @@ public class ConfigDB { if (!config.contains("config.ShowRate")) { useWorlds.add("world"); - useMessages.add("Even Notch can�t save you now!"); + useMessages.add("Even Notch can't save you now!"); useMessages.add("Fear me!"); useMessages.add("Welcome to my world!"); useMessages.add("I am your death!"); useMessages.add("Grave awaits you!"); - useSignMessages.add("I�m watching."); + useSignMessages.add("I'm watching."); useSignMessages.add("Death..."); useSignMessages.add("Eyes in dark..."); useBookMessages.add("White eyes in dark..."); @@ -379,7 +379,7 @@ public class ConfigDB { ArrayList allWorlds = new ArrayList(); List worlds_ = Bukkit.getWorlds(); for (int i = 0; i <= worlds_.size() - 1; i++) { - if (!worlds_.get(i).getName().equalsIgnoreCase("world_herobrineai_graveyard")) { + if (!worlds_.get(i).getName().equalsIgnoreCase("world_herobrine_graveyard")) { allWorlds.add(worlds_.get(i).getName()); } } diff --git a/src/net/theprogrammersworld/herobrine/Herobrine.java b/src/net/theprogrammersworld/herobrine/Herobrine.java index cd5e177..a345fba 100644 --- a/src/net/theprogrammersworld/herobrine/Herobrine.java +++ b/src/net/theprogrammersworld/herobrine/Herobrine.java @@ -136,10 +136,10 @@ public class Herobrine extends JavaPlugin implements Listener { // Graveyard World - if (this.configdb.UseGraveyardWorld == true && Bukkit.getServer().getWorld("world_herobrineai_graveyard") == null) { + if (this.configdb.UseGraveyardWorld == true && Bukkit.getServer().getWorld("world_herobrine_graveyard") == null) { log.info("[Herobrine] Creating Graveyard world..."); - WorldCreator wc = new WorldCreator("world_herobrineai_graveyard"); + WorldCreator wc = new WorldCreator("world_herobrine_graveyard"); wc.generateStructures(false); org.bukkit.WorldType type = org.bukkit.WorldType.FLAT; wc.type(type); diff --git a/src/net/theprogrammersworld/herobrine/listeners/PlayerListener.java b/src/net/theprogrammersworld/herobrine/listeners/PlayerListener.java index 8df19f3..94097c4 100644 --- a/src/net/theprogrammersworld/herobrine/listeners/PlayerListener.java +++ b/src/net/theprogrammersworld/herobrine/listeners/PlayerListener.java @@ -179,7 +179,7 @@ public class PlayerListener implements Listener { if (AICore.PlayerTarget == event.getPlayer() && PluginCore.getAICore().getCoreTypeNow() == CoreType.GRAVEYARD && event.getPlayer().getLocation().getWorld() == Bukkit.getServer() - .getWorld("world_herobrineai_graveyard") + .getWorld("world_herobrine_graveyard") && AICore.isTarget) { if (Utils.getRandomGen().nextBoolean()) { @@ -247,9 +247,9 @@ public class PlayerListener implements Listener { // Prevent player from moving when in Herobrine's Graveyard. if (event.getPlayer().getEntityId() != PluginCore.HerobrineEntityID) { - if (event.getPlayer().getWorld() == Bukkit.getServer().getWorld("world_herobrineai_graveyard")) { + if (event.getPlayer().getWorld() == Bukkit.getServer().getWorld("world_herobrine_graveyard")) { Player player = (Player) event.getPlayer(); - player.teleport(new Location(Bukkit.getServer().getWorld("world_herobrineai_graveyard"), -2.49f, 4.f, + player.teleport(new Location(Bukkit.getServer().getWorld("world_herobrine_graveyard"), -2.49f, 4.f, 10.69f, -179.85f, 0.44999f)); } }