Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ignore yaw changes in player move event.

Browse Source
This commit is contained in:
DNx5 2015-11-24 21:55:55 +07:00
parent 8e9bfc6299
commit 5be476e2d6
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
View File

@ -164,15 +164,21 @@ public class AuthMePlayerListener implements Listener {
*/ */
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
if (event.isCancelled()) if (event.isCancelled()) {
return; return;
}
int radius = Settings.getMovementRadius;
boolean allowMove = Settings.isMovementAllowed;
if (Settings.noTeleport) { if (Settings.noTeleport) {
return; return;
} }
if (allowMove && radius <= 0) {
if (Settings.isMovementAllowed && Settings.getMovementRadius <= 0) {
return;
}
if (event.getFrom().getBlockX() == event.getTo().getBlockX()
&& event.getFrom().getBlockY() == event.getTo().getBlockY()
&& event.getFrom().getBlockZ() == event.getTo().getBlockZ()) {
return; return;
} }
@ -181,9 +187,9 @@ public class AuthMePlayerListener implements Listener {
return; return;
} }
if (!allowMove) { if (!Settings.isMovementAllowed) {
if (event.getFrom().distance(event.getTo()) > 0) { if (event.getFrom().distance(event.getTo()) > 0) {
event.setCancelled(true); event.setTo(event.getFrom());
return; return;
} }
} }
@ -194,7 +200,7 @@ public class AuthMePlayerListener implements Listener {
player.teleport(spawn); player.teleport(spawn);
return; return;
} }
if ((spawn.distance(player.getLocation()) > radius)) { if ((spawn.distance(player.getLocation()) > Settings.getMovementRadius)) {
player.teleport(spawn); player.teleport(spawn);
} }
} }

8
src/main/java/fr/xephi/authme/util/Utils.java
View File

@ -173,7 +173,8 @@ public final class Utils {
assert permsMan != null; assert permsMan != null;
// Remove old groups // Remove old groups
permsMan.removeGroups(player, Arrays.asList(Settings.unRegisteredGroup, Settings.getRegisteredGroup, Settings.getUnloggedinGroup)); permsMan.removeGroups(player, Arrays.asList(Settings.unRegisteredGroup,
Settings.getRegisteredGroup, Settings.getUnloggedinGroup));
// Add the normal group, return the result // Add the normal group, return the result
return permsMan.addGroup(player, group); return permsMan.addGroup(player, group);
@ -185,13 +186,12 @@ public final class Utils {
return true; return true;
} }
String name = player.getName().toLowerCase(); if (PlayerCache.getInstance().isAuthenticated(player.getName())) {
if (PlayerCache.getInstance().isAuthenticated(name)) {
return true; return true;
} }
if (!Settings.isForcedRegistrationEnabled) { if (!Settings.isForcedRegistrationEnabled) {
if (!plugin.database.isAuthAvailable(name)) { if (!plugin.database.isAuthAvailable(player.getName())) {
return true; return true;
} }
} }