ChromaGaming/AliPresents
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity

Finally finished first wave of bugfixing #35

Merged
alisolarflare merged 11 commits from Bugfix into master 2016-12-19 03:19:49 +00:00
Conversation 0 Commits 11 Files changed 29 +13 -6
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8e805745b5 - Show all commits

19
src/buttondevteam/alipresents/components/flaircolour/portals/PlayerProximityLoop.java
View file

@ -13,14 +13,14 @@ public class PlayerProximityLoop extends BukkitRunnable implements Listener{
private static FlairColourComponent component; private static FlairColourComponent component;
private static Location startLocation; private static Location startLocation;
private static Location endLocation; private static Location endLocation;
private static int sX; private static int sX;
private static int sY; private static int sY;
private static int sZ; private static int sZ;
private static int eX; private static int eX;
private static int eY; private static int eY;
private static int eZ; private static int eZ;
public PlayerProximityLoop(JavaPlugin plugin, FlairColourComponent component) { public PlayerProximityLoop(JavaPlugin plugin, FlairColourComponent component) {
PlayerProximityLoop.plugin = plugin; PlayerProximityLoop.plugin = plugin;
PlayerProximityLoop.component = component; PlayerProximityLoop.component = component;
@ -31,14 +31,21 @@ public class PlayerProximityLoop extends BukkitRunnable implements Listener{
PlayerProximityLoop.sY = location.getBlockY(); PlayerProximityLoop.sY = location.getBlockY();
PlayerProximityLoop.sZ = location.getBlockZ(); PlayerProximityLoop.sZ = location.getBlockZ();
PlayerProximityLoop.startLocation = location; PlayerProximityLoop.startLocation = location;
PlayerProximityLoop.endLocation.setWorld(location.getWorld());
if (endLocation == null)
PlayerProximityLoop.endLocation = location;
else
PlayerProximityLoop.endLocation.setWorld(location.getWorld());
} }
public static void setEndLocation(Location location){ public static void setEndLocation(Location location){
PlayerProximityLoop.eX = location.getBlockX(); PlayerProximityLoop.eX = location.getBlockX();
PlayerProximityLoop.eY = location.getBlockY(); PlayerProximityLoop.eY = location.getBlockY();
PlayerProximityLoop.eZ = location.getBlockZ(); PlayerProximityLoop.eZ = location.getBlockZ();
PlayerProximityLoop.startLocation.setWorld(location.getWorld()); PlayerProximityLoop.startLocation.setWorld(location.getWorld());
PlayerProximityLoop.endLocation = location; if (endLocation == null)
PlayerProximityLoop.endLocation = location;
else
PlayerProximityLoop.endLocation.setWorld(location.getWorld());
} }
@Override @Override
@ -65,8 +72,8 @@ public class PlayerProximityLoop extends BukkitRunnable implements Listener{
if((playerZ < sZ && playerZ < eZ) || (playerZ > sZ && playerZ > eZ)) if((playerZ < sZ && playerZ < eZ) || (playerZ > sZ && playerZ > eZ))
continue; continue;
component.playersToBeFlaired.add(player); component.playersToBeFlaired.add(player);
} }
} }
} }