TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

Minor TP and timer tweaks.

Browse source
This commit is contained in:
KHobbits 2013-04-22 00:11:13 +01:00
parent f48871ff29
commit dfc62bca76
4 changed files with 56 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/Essentials.java
View file

@ -225,7 +225,7 @@ public class Essentials extends JavaPlugin implements IEssentials
final MetricsStarter metricsStarter = new MetricsStarter(this); final MetricsStarter metricsStarter = new MetricsStarter(this);
if (metricsStarter.getStart() != null && metricsStarter.getStart() == true) if (metricsStarter.getStart() != null && metricsStarter.getStart() == true)
{ {
getScheduler().runTaskLaterAsynchronously(this, metricsStarter, 1); runTaskLaterAsynchronously(metricsStarter, 1);
} }
else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false) else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false)
{ {

12
Essentials/src/com/earth2me/essentials/EssentialsTimer.java
View file

@ -52,8 +52,10 @@ public class EssentialsTimer implements Runnable
skip1--; skip1--;
continue; continue;
} }
if (count % 10 == 0) { if (count % 10 == 0)
if (System.nanoTime() - startTime > maxTime / 2) { {
if (System.nanoTime() - startTime > maxTime / 2)
{
skip1 = count - 1; skip1 = count - 1;
break; break;
} }
@ -81,8 +83,10 @@ public class EssentialsTimer implements Runnable
skip2--; skip2--;
continue; continue;
} }
if (count % 10 == 0) { if (count % 10 == 0)
if (System.nanoTime() - startTime > maxTime) { {
if (System.nanoTime() - startTime > maxTime)
{
skip2 = count - 1; skip2 = count - 1;
break; break;
} }

82
Essentials/src/com/earth2me/essentials/Teleport.java
View file

@ -14,30 +14,30 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
public class Teleport implements Runnable, ITeleport public class Teleport implements Runnable, ITeleport
{ {
private static final double MOVE_CONSTANT = 0.3; private static final double MOVE_CONSTANT = 0.3;
private class Target private class Target
{ {
private final Location location; private final Location location;
private final String name; private final String name;
Target(Location location) Target(Location location)
{ {
this.location = location; this.location = location;
this.name = null; this.name = null;
} }
Target(Player entity) Target(Player entity)
{ {
this.name = entity.getName(); this.name = entity.getName();
this.location = null; this.location = null;
} }
public Location getLocation() public Location getLocation()
{ {
if (this.name != null) if (this.name != null)
{ {
return ess.getServer().getPlayerExact(name).getLocation(); return ess.getServer().getPlayerExact(name).getLocation();
} }
return location; return location;
@ -57,16 +57,17 @@ public class Teleport implements Runnable, ITeleport
private long initZ; private long initZ;
private Target teleportTarget; private Target teleportTarget;
private boolean respawn; private boolean respawn;
private boolean canMove;
private Trade chargeFor; private Trade chargeFor;
private final IEssentials ess; private final IEssentials ess;
private static final Logger logger = Logger.getLogger("Minecraft"); private static final Logger logger = Logger.getLogger("Minecraft");
private TeleportCause cause; private TeleportCause cause;
private void initTimer(long delay, Target target, Trade chargeFor, TeleportCause cause) private void initTimer(long delay, Target target, Trade chargeFor, TeleportCause cause)
{ {
initTimer(delay, user, target, chargeFor, cause, false); initTimer(delay, user, target, chargeFor, cause, false);
} }
private void initTimer(long delay, IUser teleportUser, Target target, Trade chargeFor, TeleportCause cause, boolean respawn) private void initTimer(long delay, IUser teleportUser, Target target, Trade chargeFor, TeleportCause cause, boolean respawn)
{ {
this.started = System.currentTimeMillis(); this.started = System.currentTimeMillis();
@ -80,35 +81,48 @@ public class Teleport implements Runnable, ITeleport
this.chargeFor = chargeFor; this.chargeFor = chargeFor;
this.cause = cause; this.cause = cause;
this.respawn = respawn; this.respawn = respawn;
this.canMove = user.isAuthorized("essentials.teleport.timer.move");
teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
} }
@Override @Override
public void run() public void run()
{ {
if (user == null || !user.isOnline() || user.getLocation() == null) if (user == null || !user.isOnline() || user.getLocation() == null)
{ {
cancel(false); cancel(false);
return; return;
} }
if (teleportUser == null || !teleportUser.isOnline() || teleportUser.getLocation() == null)
if (teleportUser == null || !teleportUser.isOnline())
{ {
cancel(false); cancel(false);
return; return;
} }
if (!user.isAuthorized("essentials.teleport.timer.move") final Location currLocation = teleportUser.getLocation();
&& (Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT) != initX if (currLocation == null)
|| Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT) != initY {
|| Math.round(teleportUser.getLocation().getZ() * MOVE_CONSTANT) != initZ cancel(false);
return;
}
if (!canMove
&& (Math.round(currLocation.getX() * MOVE_CONSTANT) != initX
|| Math.round(currLocation.getY() * MOVE_CONSTANT) != initY
|| Math.round(currLocation.getZ() * MOVE_CONSTANT) != initZ
|| teleportUser.getHealth() < health)) || teleportUser.getHealth() < health))
{ {
// user moved, cancel teleport // user moved, cancel teleport
cancel(true); cancel(true);
return; return;
} }
health = teleportUser.getHealth(); // in case user healed, then later gets injured health = teleportUser.getHealth(); // in case user healed, then later gets injured
long now = System.currentTimeMillis(); final long now = System.currentTimeMillis();
if (now > started + tpdelay) if (now > started + tpdelay)
{ {
try try
@ -146,13 +160,13 @@ public class Teleport implements Runnable, ITeleport
} }
} }
} }
public Teleport(IUser user, IEssentials ess) public Teleport(IUser user, IEssentials ess)
{ {
this.user = user; this.user = user;
this.ess = ess; this.ess = ess;
} }
public void cooldown(boolean check) throws Exception public void cooldown(boolean check) throws Exception
{ {
final Calendar time = new GregorianCalendar(); final Calendar time = new GregorianCalendar();
@ -168,7 +182,7 @@ public class Teleport implements Runnable, ITeleport
// When was the last teleport used? // When was the last teleport used?
final Long lastTime = user.getLastTeleportTimestamp(); final Long lastTime = user.getLastTeleportTimestamp();
if (lastTime > time.getTimeInMillis()) if (lastTime > time.getTimeInMillis())
{ {
// This is to make sure time didn't get messed up on last kit use. // This is to make sure time didn't get messed up on last kit use.
@ -225,7 +239,7 @@ public class Teleport implements Runnable, ITeleport
} }
now(new Target(loc), cause); now(new Target(loc), cause);
} }
public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception
{ {
if (cooldown) if (cooldown)
@ -234,7 +248,7 @@ public class Teleport implements Runnable, ITeleport
} }
now(new Target(entity), cause); now(new Target(entity), cause);
} }
private void now(Target target, TeleportCause cause) throws Exception private void now(Target target, TeleportCause cause) throws Exception
{ {
cancel(false); cancel(false);
@ -249,21 +263,21 @@ public class Teleport implements Runnable, ITeleport
{ {
teleport(loc, chargeFor, TeleportCause.PLUGIN); teleport(loc, chargeFor, TeleportCause.PLUGIN);
} }
public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
{ {
teleport(new Target(loc), chargeFor, cause); teleport(new Target(loc), chargeFor, cause);
} }
public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception
{ {
teleport(new Target(entity), chargeFor, cause); teleport(new Target(entity), chargeFor, cause);
} }
private void teleport(Target target, Trade chargeFor, TeleportCause cause) throws Exception private void teleport(Target target, Trade chargeFor, TeleportCause cause) throws Exception
{ {
double delay = ess.getSettings().getTeleportDelay(); double delay = ess.getSettings().getTeleportDelay();
if (chargeFor != null) if (chargeFor != null)
{ {
chargeFor.isAffordableFor(user); chargeFor.isAffordableFor(user);
@ -279,12 +293,10 @@ public class Teleport implements Runnable, ITeleport
} }
return; return;
} }
cancel(false); cancel(false);
warnUser(user, delay); warnUser(user, delay);
initTimer((long)(delay * 1000.0), target, chargeFor, cause); initTimer((long)(delay * 1000.0), target, chargeFor, cause);
teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
} }
//The teleportToMe function is a wrapper used to handle teleporting players to them, like /tphere //The teleportToMe function is a wrapper used to handle teleporting players to them, like /tphere
@ -292,7 +304,7 @@ public class Teleport implements Runnable, ITeleport
{ {
Target target = new Target(user); Target target = new Target(user);
double delay = ess.getSettings().getTeleportDelay(); double delay = ess.getSettings().getTeleportDelay();
if (chargeFor != null) if (chargeFor != null)
{ {
chargeFor.isAffordableFor(user); chargeFor.isAffordableFor(user);
@ -308,13 +320,12 @@ public class Teleport implements Runnable, ITeleport
} }
return; return;
} }
cancel(false); cancel(false);
warnUser(otherUser, delay); warnUser(otherUser, delay);
initTimer((long)(delay * 1000.0), otherUser, target, chargeFor, cause, false); initTimer((long)(delay * 1000.0), otherUser, target, chargeFor, cause, false);
teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
} }
private void warnUser(final IUser user, final double delay) private void warnUser(final IUser user, final double delay)
{ {
Calendar c = new GregorianCalendar(); Calendar c = new GregorianCalendar();
@ -342,13 +353,12 @@ public class Teleport implements Runnable, ITeleport
} }
return; return;
} }
cancel(false); cancel(false);
warnUser(user, delay); warnUser(user, delay);
initTimer((long)(delay * 1000.0), user, null, chargeFor, cause, true); initTimer((long)(delay * 1000.0), user, null, chargeFor, cause, true);
teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
} }
public void respawn(TeleportCause cause) throws Exception public void respawn(TeleportCause cause) throws Exception
{ {
final Player player = user.getBase(); final Player player = user.getBase();

2
Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java
View file

@ -33,7 +33,7 @@ public class MetricsListener implements Listener
player.sendMessage("To opt out, run /essentials opt-out"); player.sendMessage("To opt out, run /essentials opt-out");
ess.getLogger().log(Level.INFO, "[Metrics] Admin join - Starting 5 minute opt-out period."); ess.getLogger().log(Level.INFO, "[Metrics] Admin join - Starting 5 minute opt-out period.");
ess.getSettings().setMetricsEnabled(true); ess.getSettings().setMetricsEnabled(true);
ess.getScheduler().runTaskLaterAsynchronously(ess, starter, 5 * 1200); ess.runTaskLaterAsynchronously(starter, 5 * 1200);
} }
} }
} }