From 4c812b512981ce821ce05e5f97e36dfee87206a4 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 22 Oct 2016 20:35:57 -0400 Subject: [PATCH] Adjusted RandomTP to be static --- src/alisolarflare/DebugRTP.java | 27 ++++++++ .../{RandomTP.java => RandomTPModule.java} | 69 +++++++------------ src/iie/HelloWorldPlugin.java | 8 ++- 3 files changed, 56 insertions(+), 48 deletions(-) create mode 100644 src/alisolarflare/DebugRTP.java rename src/alisolarflare/{RandomTP.java => RandomTPModule.java} (73%) diff --git a/src/alisolarflare/DebugRTP.java b/src/alisolarflare/DebugRTP.java new file mode 100644 index 0000000..eaa0bb6 --- /dev/null +++ b/src/alisolarflare/DebugRTP.java @@ -0,0 +1,27 @@ +package alisolarflare; + +import org.bukkit.Location; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class DebugRTP implements CommandExecutor { + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if(!(sender instanceof Player)){ + sender.sendMessage("You must be a Player to use this command!"); + sender.sendMessage(sender.toString()); + return false; + } + Player player = (Player) sender; + if(player.getWorld().getName() != "hardcore"){ + sender.sendMessage("You must be in the hardcore world to use this command!"); + sender.sendMessage("Current World: " + player.getWorld().getName()); + return false; + } + RandomTPModule.rtp(player, player.getWorld(), new Location(player.getWorld(), 644, 65, -944), new Location(player.getWorld(), 1700, 65, 464)); + return false; + } +} diff --git a/src/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTPModule.java similarity index 73% rename from src/alisolarflare/RandomTP.java rename to src/alisolarflare/RandomTPModule.java index d92800c..3bf96a1 100644 --- a/src/alisolarflare/RandomTP.java +++ b/src/alisolarflare/RandomTPModule.java @@ -1,33 +1,31 @@ package alisolarflare; +import java.util.HashMap; + import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import iie.HelloWorldPlugin; -public class RandomTP implements CommandExecutor{ - - private int conflictX; - private int conflictZ; - private int conflictRadius = 70; - private boolean northUsed; - private boolean southUsed; - private boolean eastUsed; - private boolean westUsed; +public class RandomTPModule{ + private static int conflictX; + private static int conflictZ; + private static int conflictRadius = 70; + private static boolean northUsed; + private static boolean southUsed; + private static boolean eastUsed; + private static boolean westUsed; @SuppressWarnings("unused") private HelloWorldPlugin helloWorldPlugin; - public RandomTP(HelloWorldPlugin helloWorldPlugin) { + public RandomTPModule(HelloWorldPlugin helloWorldPlugin) { this.helloWorldPlugin = helloWorldPlugin; } //every 4 players who use it will be teleported near each other. - //ex. iie > 1200, ali -> 1210, byz -> 1190, charles -> 1195, wind -> 300, zan -> 310, etc - public void conflictRtp(Player player, World world, Location minLocation, Location maxLocation){ + //ex. iie 2000, ali 2010, byz 2005, charles 1995, wind 300, zan 310, etc + public static void conflictRtp(Player player, World world, Location minLocation, Location maxLocation){ //INIT - xDifference, xAverage int xdifference = minLocation.getBlockX() - maxLocation.getBlockX(); int xAverage = (int) Math.floor(minLocation.getBlockX() + maxLocation.getBlockX() / 2); @@ -59,10 +57,10 @@ public class RandomTP implements CommandExecutor{ //TRANSFER - data to class if (groundIsSafe && (northIsSafe || southIsSafe || eastIsSafe || westIsSafe)){ - northUsed = northIsSafe; - eastUsed = eastIsSafe; - westUsed = westIsSafe; - southUsed = southIsSafe; + northUsed = !northIsSafe; + eastUsed = !eastIsSafe; + westUsed = !westIsSafe; + southUsed = !southIsSafe; conflictX = attemptedX; conflictZ = attemptedZ; @@ -74,28 +72,28 @@ public class RandomTP implements CommandExecutor{ String dir = "north"; //CHOOSES A RANDOM DIRECTION - for(int i = 0; i < 1000; i++){ + for(int i = 0; i < 200; i++){ double randomDirection = Math.random(); if (randomDirection < 0.25){ - if(northUsed){ + if(!northUsed){ northUsed = true; dir = "north"; break; } }else if(randomDirection < 0.50){ - if(eastUsed){ + if(!eastUsed){ eastUsed = true; dir = "east"; break; } }else if(randomDirection < 0.75){ - if(southUsed){ + if(!southUsed){ southUsed = true; dir = "south"; break; } }else{ - if(westUsed){ + if(!westUsed){ westUsed = true; dir = "west"; break; @@ -108,19 +106,15 @@ public class RandomTP implements CommandExecutor{ //TELEPORT - teleports player to the conflict point switch(dir){ case "north": - northUsed = false; player.teleport(world.getHighestBlockAt(conflictX, conflictZ - conflictRadius).getLocation()); break; case "east": - eastUsed = false; player.teleport(world.getHighestBlockAt(conflictX + conflictRadius, conflictZ).getLocation()); break; case "south": - southUsed = false; player.teleport(world.getHighestBlockAt(conflictX, conflictZ + conflictRadius).getLocation()); break; case "west": - westUsed = false; player.teleport(world.getHighestBlockAt(conflictX - conflictRadius, conflictZ).getLocation()); break; default: @@ -130,7 +124,7 @@ public class RandomTP implements CommandExecutor{ } //Randomly teleports a player, into the hardcore world - public void rtp(Player player, World world, Location minLocation, Location maxLocation){ + public static void rtp(Player player, World world, Location minLocation, Location maxLocation){ player.sendMessage("TELEPORT INITIATED"); player.sendMessage("minLocation: " + minLocation.toString()); player.sendMessage("maxLocation: " + maxLocation.toString()); @@ -163,21 +157,4 @@ public class RandomTP implements CommandExecutor{ //player.teleport(arg0) } } - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if(!(sender instanceof Player)){ - sender.sendMessage("You must be a Player to use this command!"); - sender.sendMessage(sender.toString()); - return false; - } - Player player = (Player) sender; - if(player.getWorld().getName() != "hardcore"){ - sender.sendMessage("You must be in the hardcore world to use this command!"); - sender.sendMessage("Current World: " + player.getWorld().getName()); - return false; - } - rtp(player, player.getWorld(), new Location(player.getWorld(), 644, 65, -944), new Location(player.getWorld(), 1700, 65, 464)); - return false; - } } diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 6785820..6ef4735 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -10,7 +10,9 @@ import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Scoreboard; -import alisolarflare.RandomTP; +import alisolarflare.DebugRTP; +import alisolarflare.RandomTPModule; +import alisolarflare.listeners.CompassLobby; import alisolarflare.listeners.ConflictCompassCraftingListener; import alisolarflare.listeners.DiamondArmorBlocker; @@ -50,14 +52,16 @@ public class HelloWorldPlugin extends JavaPlugin { getServer().getPluginManager().registerEvents(new JoinListener(this), this); getServer().getPluginManager().registerEvents(new DeathListener(this), this); getServer().getPluginManager().registerEvents(new BoundaryListener(this), this); + getServer().getPluginManager().registerEvents(new DiamondArmorBlocker(), this); getServer().getPluginManager().registerEvents(new ConflictCompassCraftingListener(), this); + getServer().getPluginManager().registerEvents(new CompassLobby(), this); } public void registerCommands(){ getCommand("hardcore").setExecutor(new HelloWorld(this)); - getCommand("debugRTP").setExecutor(new RandomTP(this)); + getCommand("debugRTP").setExecutor(new DebugRTP()); } } \ No newline at end of file