From aaeceae5d215ffc29450ea7601efd2a2a847570c Mon Sep 17 00:00:00 2001 From: Xephi Date: Mon, 16 Dec 2013 04:07:09 +0100 Subject: [PATCH] Correctly get the event inventory ! --- pom.xml | 2 +- .../java/fr/xephi/authme/listener/AuthMePlayerListener.java | 2 +- src/main/resources/plugin.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index bb458c03f..5f3b32fd6 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ - 3.1.1 + 3.1.2-DEV-1 org.bukkit diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 876f88602..16fee6c56 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -746,7 +746,7 @@ public class AuthMePlayerListener implements Listener { RestoreInventoryEvent ev = new RestoreInventoryEvent(player, limbo.getInventory(), limbo.getArmour()); plugin.getServer().getPluginManager().callEvent(ev); if (!ev.isCancelled()) { - API.setPlayerInventory(player, limbo.getInventory(), limbo.getArmour()); + API.setPlayerInventory(player, ev.getInventory(), ev.getArmor()); } } utils.addNormal(player, limbo.getGroup()); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e22d43ef6..145418242 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ author: Xephi59 website: http://dev.bukkit.org/bukkit-plugins/authme-recoded/ description: AuthMe prevents people, which aren't logged in, from doing stuff like placing blocks, moving, typing commands or seeing the inventory of the current player. main: fr.xephi.authme.AuthMe -version: 3.1.1 +version: 3.1.2-DEV-1 softdepend: [Vault, ChestShop, Spout, Multiverse-Core, Notifications, Citizens, CombatTag, Essentials, EssentialsSpawn] commands: register: