Fork/herobrine-2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed directory name used for "world_herobrineai_graveyard" to "world_herobrine_graveyard"

Browse Source
This commit is contained in:
David Berdik 2019-12-28 16:01:07 -05:00
parent e4a8ca3b81
commit e8f6461425
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/net/theprogrammersworld/herobrine/AI/cores/Graveyard.java
View File

@ -36,7 +36,7 @@ public class Graveyard extends Core {
public CoreResult Teleport(Player player) { public CoreResult Teleport(Player player) {
if (Herobrine.getPluginCore().getConfigDB().UseGraveyardWorld == true) { if (Herobrine.getPluginCore().getConfigDB().UseGraveyardWorld == true) {
if (!Herobrine.getPluginCore().getAICore().checkAncientSword(player.getInventory())) { 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++) { for (int i = 0; i <= LivingEntities.size() - 1; i++) {
if (LivingEntities.get(i) instanceof Player || LivingEntities.get(i).getEntityId() == PluginCore.HerobrineEntityID) { 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; AICore.PlayerTarget = player;
Location loc = (Location) player.getLocation(); Location loc = (Location) player.getLocation();
savedX = loc.getX(); savedX = loc.getX();
@ -56,7 +56,7 @@ public class Graveyard extends Core {
savedZ = loc.getZ(); savedZ = loc.getZ();
savedWorld = loc.getWorld(); savedWorld = loc.getWorld();
savedPlayer = player; savedPlayer = player;
loc.setWorld(Bukkit.getServer().getWorld("world_herobrineai_graveyard")); loc.setWorld(Bukkit.getServer().getWorld("world_herobrine_graveyard"));
loc.setX(-2.49); loc.setX(-2.49);
loc.setY(4); loc.setY(4);
loc.setZ(10.69); loc.setZ(10.69);
@ -67,7 +67,7 @@ public class Graveyard extends Core {
Start(); Start();
AICore.isTarget = true; 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!"); return new CoreResult(true, "Player successfully teleported!");
} else { } else {
@ -80,7 +80,7 @@ public class Graveyard extends Core {
public void Start() { public void Start() {
ticks = 0; 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(); HandlerInterval();
} }
@ -96,7 +96,7 @@ public class Graveyard extends Core {
public void Handler() { 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++) { for (int i = 0; i <= LivingEntities.size() - 1; i++) {
if (LivingEntities.get(i) instanceof Player if (LivingEntities.get(i) instanceof Player
@ -111,7 +111,7 @@ public class Graveyard extends Core {
if (savedPlayer.isDead() == true if (savedPlayer.isDead() == true
|| savedPlayer.isOnline() == false || 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) { || this.ticks == 90 || AICore.isTarget == false) {
if (AICore.PlayerTarget == savedPlayer) { if (AICore.PlayerTarget == savedPlayer) {
@ -126,27 +126,27 @@ public class Graveyard extends Core {
PluginCore.HerobrineNPC.lookAtPoint(ploc); PluginCore.HerobrineNPC.lookAtPoint(ploc);
if (ticks == 1) { if (ticks == 1) {
PluginCore.HerobrineNPC.moveTo( 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) { } else if (ticks == 40) {
PluginCore.HerobrineNPC.moveTo( 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) { } else if (ticks == 60) {
PluginCore.HerobrineNPC.moveTo( 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) { } else if (ticks == 84) {
PluginCore.HerobrineNPC.moveTo( 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(); Random randomGen = Utils.getRandomGen();
if (randomGen.nextInt(4) == 1) { 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), (double) Utils.getRandomGen().nextInt(20) + 20,
(double) randomGen.nextInt(400)); (double) randomGen.nextInt(400));
Bukkit.getServer().getWorld("world_herobrineai_graveyard").strikeLightning(newloc); Bukkit.getServer().getWorld("world_herobrine_graveyard").strikeLightning(newloc);
} }
ticks++; ticks++;
HandlerInterval(); HandlerInterval();

2
src/net/theprogrammersworld/herobrine/AI/extensions/GraveyardWorld.java
View File

@ -11,7 +11,7 @@ public class GraveyardWorld {
public static void Create() { 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 x = -50; x <= 50; x++) {
for (int z = -50; z <= 50; z++) { for (int z = -50; z <= 50; z++) {

6
src/net/theprogrammersworld/herobrine/ConfigDB.java
View File

@ -163,12 +163,12 @@ public class ConfigDB {
if (!config.contains("config.ShowRate")) { if (!config.contains("config.ShowRate")) {
useWorlds.add("world"); useWorlds.add("world");
useMessages.add("Even Notch can<EFBFBD>t save you now!"); useMessages.add("Even Notch can't save you now!");
useMessages.add("Fear me!"); useMessages.add("Fear me!");
useMessages.add("Welcome to my world!"); useMessages.add("Welcome to my world!");
useMessages.add("I am your death!"); useMessages.add("I am your death!");
useMessages.add("Grave awaits you!"); useMessages.add("Grave awaits you!");
useSignMessages.add("I<EFBFBD>m watching."); useSignMessages.add("I'm watching.");
useSignMessages.add("Death..."); useSignMessages.add("Death...");
useSignMessages.add("Eyes in dark..."); useSignMessages.add("Eyes in dark...");
useBookMessages.add("White eyes in dark..."); useBookMessages.add("White eyes in dark...");
@ -379,7 +379,7 @@ public class ConfigDB {
ArrayList<String> allWorlds = new ArrayList<String>(); ArrayList<String> allWorlds = new ArrayList<String>();
List<World> worlds_ = Bukkit.getWorlds(); List<World> worlds_ = Bukkit.getWorlds();
for (int i = 0; i <= worlds_.size() - 1; i++) { 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()); allWorlds.add(worlds_.get(i).getName());
} }
} }

4
src/net/theprogrammersworld/herobrine/Herobrine.java
View File

@ -136,10 +136,10 @@ public class Herobrine extends JavaPlugin implements Listener {
// Graveyard World // 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..."); log.info("[Herobrine] Creating Graveyard world...");
WorldCreator wc = new WorldCreator("world_herobrineai_graveyard"); WorldCreator wc = new WorldCreator("world_herobrine_graveyard");
wc.generateStructures(false); wc.generateStructures(false);
org.bukkit.WorldType type = org.bukkit.WorldType.FLAT; org.bukkit.WorldType type = org.bukkit.WorldType.FLAT;
wc.type(type); wc.type(type);

6
src/net/theprogrammersworld/herobrine/listeners/PlayerListener.java
View File

@ -179,7 +179,7 @@ public class PlayerListener implements Listener {
if (AICore.PlayerTarget == event.getPlayer() if (AICore.PlayerTarget == event.getPlayer()
&& PluginCore.getAICore().getCoreTypeNow() == CoreType.GRAVEYARD && PluginCore.getAICore().getCoreTypeNow() == CoreType.GRAVEYARD
&& event.getPlayer().getLocation().getWorld() == Bukkit.getServer() && event.getPlayer().getLocation().getWorld() == Bukkit.getServer()
.getWorld("world_herobrineai_graveyard") .getWorld("world_herobrine_graveyard")
&& AICore.isTarget) { && AICore.isTarget) {
if (Utils.getRandomGen().nextBoolean()) { if (Utils.getRandomGen().nextBoolean()) {
@ -247,9 +247,9 @@ public class PlayerListener implements Listener {
// Prevent player from moving when in Herobrine's Graveyard. // Prevent player from moving when in Herobrine's Graveyard.
if (event.getPlayer().getEntityId() != PluginCore.HerobrineEntityID) { 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 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)); 10.69f, -179.85f, 0.44999f));
} }
} }