mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-10-04 01:17:41 +02:00
CleanUp (removed setinventory api method
This commit is contained in:
parent
aed42670f6
commit
4c2348e6e3
30
pom.xml
30
pom.xml
@ -6,6 +6,7 @@
|
|||||||
<groupId>fr.xephi</groupId>
|
<groupId>fr.xephi</groupId>
|
||||||
<artifactId>authme</artifactId>
|
<artifactId>authme</artifactId>
|
||||||
<version>5.1-SNAPSHOT</version>
|
<version>5.1-SNAPSHOT</version>
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>AuthMeReloaded</name>
|
<name>AuthMeReloaded</name>
|
||||||
<description>Authentication plugin for CraftBukkit/Spigot!</description>
|
<description>Authentication plugin for CraftBukkit/Spigot!</description>
|
||||||
@ -88,9 +89,8 @@
|
|||||||
<artifactSet>
|
<artifactSet>
|
||||||
<includes>
|
<includes>
|
||||||
<include>com.zaxxer:HikariCP</include>
|
<include>com.zaxxer:HikariCP</include>
|
||||||
<include>org.slf4j:slf4j-simple</include>
|
<include>org.slf4j:slf4j-jdk14</include>
|
||||||
<include>org.slf4j:slf4j-api</include>
|
<include>org.slf4j:slf4j-api</include>
|
||||||
<include>com.google.code.gson:gson</include>
|
|
||||||
<include>com.maxmind.geoip:geoip-api</include>
|
<include>com.maxmind.geoip:geoip-api</include>
|
||||||
<include>com.sun.mail:javax.mail</include>
|
<include>com.sun.mail:javax.mail</include>
|
||||||
<include>com.comphenix.attribute:AttributeStorage</include>
|
<include>com.comphenix.attribute:AttributeStorage</include>
|
||||||
@ -194,7 +194,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-simple</artifactId>
|
<artifactId>slf4j-jdk14</artifactId>
|
||||||
<version>1.7.12</version>
|
<version>1.7.12</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
@ -308,13 +308,23 @@
|
|||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--ProtocolLib http://dev.bukkit.org/bukkit-plugins/protocollib/ -->
|
<!--ProtocolLib http://dev.bukkit.org/bukkit-plugins/protocollib/ -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.comphenix.protocol</groupId>
|
<groupId>com.comphenix.protocol</groupId>
|
||||||
<artifactId>ProtocolLib</artifactId>
|
<artifactId>ProtocolLib</artifactId>
|
||||||
<version>3.4.0</version>
|
<version>3.4.0</version>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>cglib-nodep</artifactId>
|
||||||
|
<groupId>cglib</groupId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>BukkitExecutors</artifactId>
|
||||||
|
<groupId>com.comphenix.executors</groupId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- Vault, http://dev.bukkit.org/bukkit-plugins/vault/ -->
|
<!-- Vault, http://dev.bukkit.org/bukkit-plugins/vault/ -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -160,7 +160,6 @@ public class Utils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TODO: remove if not needed
|
// TODO: remove if not needed
|
||||||
@SuppressWarnings("unused")
|
|
||||||
public static void hasPermOnJoin(Player player) {
|
public static void hasPermOnJoin(Player player) {
|
||||||
if (plugin.permission == null)
|
if (plugin.permission == null)
|
||||||
return;
|
return;
|
||||||
|
@ -6,11 +6,9 @@ import org.bukkit.Bukkit;
|
|||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
|
|
||||||
import fr.xephi.authme.AuthMe;
|
import fr.xephi.authme.AuthMe;
|
||||||
import fr.xephi.authme.ConsoleLogger;
|
|
||||||
import fr.xephi.authme.Utils;
|
import fr.xephi.authme.Utils;
|
||||||
import fr.xephi.authme.cache.auth.PlayerAuth;
|
import fr.xephi.authme.cache.auth.PlayerAuth;
|
||||||
import fr.xephi.authme.cache.auth.PlayerCache;
|
import fr.xephi.authme.cache.auth.PlayerCache;
|
||||||
@ -94,16 +92,6 @@ public class NewAPI {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPlayerInventory(Player player, ItemStack[] content,
|
|
||||||
ItemStack[] armor) {
|
|
||||||
try {
|
|
||||||
player.getInventory().setContents(content);
|
|
||||||
player.getInventory().setArmorContents(armor);
|
|
||||||
} catch (Exception npe) {
|
|
||||||
ConsoleLogger.showError("Some error appear while trying to set inventory for " + player.getName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param playerName
|
* @param playerName
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package fr.xephi.authme.events;
|
package fr.xephi.authme.events;
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This event restore the inventory.
|
* This event restore the inventory.
|
||||||
@ -10,37 +9,15 @@ import org.bukkit.inventory.ItemStack;
|
|||||||
*/
|
*/
|
||||||
public class RestoreInventoryEvent extends CustomEvent {
|
public class RestoreInventoryEvent extends CustomEvent {
|
||||||
|
|
||||||
private ItemStack[] inventory;
|
|
||||||
private ItemStack[] armor;
|
|
||||||
private Player player;
|
private Player player;
|
||||||
|
|
||||||
public RestoreInventoryEvent(Player player) {
|
public RestoreInventoryEvent(Player player) {
|
||||||
this.player = player;
|
this.player = player;
|
||||||
this.inventory = player.getInventory().getContents();
|
|
||||||
this.armor = player.getInventory().getArmorContents();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public RestoreInventoryEvent(Player player, boolean async) {
|
public RestoreInventoryEvent(Player player, boolean async) {
|
||||||
super(async);
|
super(async);
|
||||||
this.player = player;
|
this.player = player;
|
||||||
this.inventory = inventory;
|
|
||||||
this.armor = armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack[] getInventory() {
|
|
||||||
return this.inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setInventory(ItemStack[] inventory) {
|
|
||||||
this.inventory = inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack[] getArmor() {
|
|
||||||
return this.armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setArmor(ItemStack[] armor) {
|
|
||||||
this.armor = armor;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Player getPlayer() {
|
public Player getPlayer() {
|
||||||
|
@ -95,7 +95,6 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
|
|||||||
RestoreInventoryEvent event = new RestoreInventoryEvent(player);
|
RestoreInventoryEvent event = new RestoreInventoryEvent(player);
|
||||||
Bukkit.getServer().getPluginManager().callEvent(event);
|
Bukkit.getServer().getPluginManager().callEvent(event);
|
||||||
if (!event.isCancelled()) {
|
if (!event.isCancelled()) {
|
||||||
plugin.api.setPlayerInventory(player, event.getInventory(), event.getArmor());
|
|
||||||
plugin.inventoryProtector.sendInventoryPacket(player);
|
plugin.inventoryProtector.sendInventoryPacket(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,9 +4,7 @@ import org.bukkit.GameMode;
|
|||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import fr.xephi.authme.AuthMe;
|
import fr.xephi.authme.AuthMe;
|
||||||
import fr.xephi.authme.events.RestoreInventoryEvent;
|
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
|
|
||||||
public class ProcessSyncronousPlayerQuit implements Runnable {
|
public class ProcessSyncronousPlayerQuit implements Runnable {
|
||||||
|
|
||||||
@ -28,11 +26,6 @@ public class ProcessSyncronousPlayerQuit implements Runnable {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
RestoreInventoryEvent ev = new RestoreInventoryEvent(player);
|
|
||||||
Bukkit.getPluginManager().callEvent(ev);
|
|
||||||
if (!ev.isCancelled()) {
|
|
||||||
plugin.api.setPlayerInventory(player, ev.getInventory(), ev.getArmor());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (needToChange) {
|
if (needToChange) {
|
||||||
player.setOp(isOp);
|
player.setOp(isOp);
|
||||||
|
@ -95,9 +95,7 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
|
|||||||
if (Settings.protectInventoryBeforeLogInEnabled && plugin.inventoryProtector != null) {
|
if (Settings.protectInventoryBeforeLogInEnabled && plugin.inventoryProtector != null) {
|
||||||
RestoreInventoryEvent event = new RestoreInventoryEvent(player);
|
RestoreInventoryEvent event = new RestoreInventoryEvent(player);
|
||||||
Bukkit.getPluginManager().callEvent(event);
|
Bukkit.getPluginManager().callEvent(event);
|
||||||
if (!event.isCancelled() && event.getArmor() != null && event.getInventory() != null) {
|
if (!event.isCancelled()) {
|
||||||
player.getInventory().setContents(event.getInventory());
|
|
||||||
player.getInventory().setArmorContents(event.getArmor());
|
|
||||||
plugin.inventoryProtector.sendInventoryPacket(player);
|
plugin.inventoryProtector.sendInventoryPacket(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user