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

Merge branch 'master' of github.com:essentials/Essentials into essmaster

Browse source
This commit is contained in:
KHobbits 2011-09-29 00:34:10 +01:00
commit a8cfbe1eab
3 changed files with 493 additions and 494 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -94,16 +94,9 @@ public class EssentialsPlayerListener extends PlayerListener
final Location from = event.getFrom();
final Location to = event.getTo().clone();
to.setX(from.getX());
to.setY(from.getY());
to.setY(from.getBlock().getTypeId() == 0 ? from.getY() - 1 : from.getY());
to.setZ(from.getZ());
try
{
event.setTo(Util.getSafeDestination(to));
}
catch (Exception ex)
{
event.setTo(to);
}
return;
}

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

@ -55,7 +55,7 @@ public class BPermissionsHandler implements IPermissionsHandler
@Override
public boolean canBuild(final Player base, final String group)
{
return hasPermission(base, "bPermissions.build");
return hasPermission(base, "essentials.build") || hasPermission(base, "bPermissions.build");
}
@Override

6
Essentials/src/com/earth2me/essentials/perm/PermissionsBukkitHandler.java
View file

@ -74,4 +74,10 @@ public class PermissionsBukkitHandler extends SuperpermsHandler
}
return false;
}
@Override
public boolean canBuild(Player base, String group)
{
return base.hasPermission("essentials.build") || base.hasPermission("permissions.build");
}
}