Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-23 18:55:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into random-logout

Browse Source
This commit is contained in:
Gabriele C 2016-06-28 16:14:19 +02:00
commit 1c5d4d697a
5 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -100,7 +100,6 @@ public class AuthMe extends JavaPlugin {
// Plugin instance // Plugin instance
private static AuthMe plugin; private static AuthMe plugin;
private NewAPI api;
private Management management; private Management management;
private CommandHandler commandHandler; private CommandHandler commandHandler;
private PermissionsManager permsMan; private PermissionsManager permsMan;
@ -300,9 +299,9 @@ public class AuthMe extends JavaPlugin {
passwordSecurity = initializer.get(PasswordSecurity.class); passwordSecurity = initializer.get(PasswordSecurity.class);
spawnLoader = initializer.get(SpawnLoader.class); spawnLoader = initializer.get(SpawnLoader.class);
commandHandler = initializer.get(CommandHandler.class); commandHandler = initializer.get(CommandHandler.class);
api = initializer.get(NewAPI.class);
management = initializer.get(Management.class); management = initializer.get(Management.class);
geoLiteApi = initializer.get(GeoLiteAPI.class); geoLiteApi = initializer.get(GeoLiteAPI.class);
initializer.get(NewAPI.class);
initializer.get(API.class); initializer.get(API.class);
} }

4
src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java
View File

@ -3,7 +3,6 @@ package fr.xephi.authme.hooks;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.SessionManager; import fr.xephi.authme.cache.SessionManager;
import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerAuth;
@ -32,9 +31,6 @@ public class BungeeCordMessage implements PluginMessageListener {
@Inject @Inject
private SessionManager sessionManager; private SessionManager sessionManager;
@Inject
private AuthMe plugin;
@Inject @Inject
private NewSetting settings; private NewSetting settings;

3
src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java
View File

@ -1,6 +1,5 @@
package fr.xephi.authme.listener; package fr.xephi.authme.listener;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.hooks.PluginHooks; import fr.xephi.authme.hooks.PluginHooks;
import fr.xephi.authme.listener.protocollib.ProtocolLibService; import fr.xephi.authme.listener.protocollib.ProtocolLibService;
@ -24,8 +23,6 @@ import javax.inject.Inject;
*/ */
public class AuthMeServerListener implements Listener { public class AuthMeServerListener implements Listener {
@Inject
private AuthMe plugin;
@Inject @Inject
private Messages messages; private Messages messages;
@Inject @Inject

7
src/main/java/fr/xephi/authme/listener/protocollib/AuthMeInventoryPacketAdapter.java
View File

@ -25,12 +25,9 @@ import com.comphenix.protocol.events.PacketEvent;
import fr.xephi.authme.AuthMe; import fr.xephi.authme.AuthMe;
import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Settings;
import org.apache.commons.lang.reflect.MethodUtils;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.Arrays; import java.util.Arrays;
import java.util.logging.Level; import java.util.logging.Level;
@ -44,10 +41,6 @@ public class AuthMeInventoryPacketAdapter extends PacketAdapter {
private static final int ARMOR_SIZE = 4; private static final int ARMOR_SIZE = 4;
private static final int MAIN_SIZE = 27; private static final int MAIN_SIZE = 27;
private static final int HOTBAR_SIZE = 9; private static final int HOTBAR_SIZE = 9;
private static final int OFF_HAND_POSITION = 45;
private final boolean offHandSupported = MethodUtils
.getAccessibleMethod(PlayerInventory.class, "getItemInOffHand", new Class[]{}) != null;
public AuthMeInventoryPacketAdapter(AuthMe plugin) { public AuthMeInventoryPacketAdapter(AuthMe plugin) {
super(plugin, PacketType.Play.Server.SET_SLOT, PacketType.Play.Server.WINDOW_ITEMS); super(plugin, PacketType.Play.Server.SET_SLOT, PacketType.Play.Server.WINDOW_ITEMS);

1
src/main/java/fr/xephi/authme/permission/handlers/PermissionHandlerException.java
View File

@ -3,6 +3,7 @@ package fr.xephi.authme.permission.handlers;
/** /**
* Exception during the instantiation of a {@link PermissionHandler}. * Exception during the instantiation of a {@link PermissionHandler}.
*/ */
@SuppressWarnings("serial")
public class PermissionHandlerException extends Exception { public class PermissionHandlerException extends Exception {
public PermissionHandlerException(String message) { public PermissionHandlerException(String message) {