Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-18 01:15:10 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'essmaster' into essrelease

Browse Source
This commit is contained in:
KHobbits 2011-09-29 00:40:16 +01:00
commit eb665a059a
5 changed files with 497 additions and 501 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 from = event.getFrom();
final Location to = event.getTo().clone(); final Location to = event.getTo().clone();
to.setX(from.getX()); to.setX(from.getX());
to.setY(from.getY()); to.setY(from.getBlock().getTypeId() == 0 ? from.getY() - 1 : from.getY());
to.setZ(from.getZ()); to.setZ(from.getZ());
try
{
event.setTo(Util.getSafeDestination(to));
}
catch (Exception ex)
{
event.setTo(to); event.setTo(to);
}
return; return;
} }

4
Essentials/src/com/earth2me/essentials/Settings.java
View File

@ -220,7 +220,7 @@ public class Settings implements ISettings
@Override @Override
public boolean isNetherEnabled() public boolean isNetherEnabled()
{ {
return config.getBoolean("nether.enabled", true); return config.getBoolean("nether.enabled", false);
} }
@Override @Override
@ -362,7 +362,7 @@ public class Settings implements ISettings
if (config.getBoolean("nether.use-1to1-ratio", false)) { if (config.getBoolean("nether.use-1to1-ratio", false)) {
return 1.0; return 1.0;
} }
return config.getDouble("nether.ratio", 16.0); return config.getDouble("nether.ratio", 8.0);
} }
@Override @Override

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

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

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

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

7
Essentials/src/config.yml
View File

@ -79,14 +79,11 @@ reclaim-onlogout: false
# Should primitive spawn protection be enabled? For most servers, this should be flase; it is better to use a third-party plugin to protect it. # Should primitive spawn protection be enabled? For most servers, this should be flase; it is better to use a third-party plugin to protect it.
spawn-protection: false spawn-protection: false
# Nether settings (switch between worlds with "/world nether" and "/world normal") # Nether settings
# Sets whether the nether system is enabled, what folder to save the world in, and whether portals should teleport players between worlds. # Sets wether you want to change the default behaviour of the nether portals.
nether: nether:
enabled: false
folder: nether
portals-enabled: false portals-enabled: false
generate-exit-portals: false generate-exit-portals: false
ratio: 16
# Mob limit on spawnmob # Mob limit on spawnmob
spawnmob-limit: 10 spawnmob-limit: 10