Upstream
/
WorldBorder
mirror of https://github.com/Brettflan/WorldBorder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge da05d6a9f7 into 40f6d4b725

This commit is contained in:
GitHub Merge Button 2012-03-03 04:25:14 -08:00
parent 40f6d4b725 da05d6a9f7
commit 4f0fd6c2f7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/wimbli/WorldBorder/BorderCheckTask.java
View File

@ -46,6 +46,9 @@ public class BorderCheckTask implements Runnable
if (border.insideBorder(loc.getX(), loc.getZ(), Config.ShapeRound()))
return null;
if (player.hasPermission("worldborder.ignoreborder"))
return null;
Location newLoc = newLocation(player, loc, border);
if (Config.whooshEffect())
@ -65,7 +68,7 @@ public class BorderCheckTask implements Runnable
player.teleport(newLoc);
else
{
Vehicle ride = player.getVehicle();
Vehicle ride = (Vehicle) player.getVehicle();
if (ride != null)
{ // vehicles need to be offset vertically and have velocity stopped
double vertOffset = ride.getLocation().getY() - loc.getY();

5
src/plugin.yml
View File

@ -31,7 +31,7 @@ commands:
/<command> debug <on/off> - turn debug mode on or off.
permissions:
worldborder.*:
description: Grants all WorldBorder permissions
description: Grants all WorldBorder permissions, except worldborder.ignoreborder
children:
worldborder.set: true
worldborder.radius: true
@ -97,3 +97,6 @@ permissions:
worldborder.whoosh:
description: Can enable/disable "whoosh" knockback effect
default: op
worldborder.ignoreborder:
description: Can move outside border
default: op