minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 18:14:38 +02:00
Code Issues Releases Wiki Activity

[trunk] empty fields in Inventory now return null instead of Material.AIR

Browse Source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1156 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo
2011-04-08 11:43:10 +00:00
parent 51ec3434f5
commit 22f9b76d77
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@@ -430,7 +430,7 @@ public class EssentialsPlayerListener extends PlayerListener
} }
User user = User.get(event.getPlayer()); User user = User.get(event.getPlayer());
ItemStack is = user.getItemInHand(); ItemStack is = user.getItemInHand();
if (is.getType() == Material.AIR) { if (is == null || is.getType() == Material.AIR) {
return; return;
} }
String command = user.getPowertool(is); String command = user.getPowertool(is);

2
Essentials/src/com/earth2me/essentials/UserData.java
View File

@@ -287,7 +287,7 @@ public abstract class UserData extends PlayerExtension implements IConf {
savedInventory = is; savedInventory = is;
config.setProperty("inventory.size", is.length); config.setProperty("inventory.size", is.length);
for (int i = 0; i < is.length; i++) { for (int i = 0; i < is.length; i++) {
if (is[i].getType() == Material.AIR) { if (is[i] == null || is[i].getType() == Material.AIR) {
continue; continue;
} }
config.setProperty("inventory."+i, is[i]); config.setProperty("inventory."+i, is[i]);

2
Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java
View File

@@ -16,7 +16,7 @@ public class Commandpowertool extends EssentialsCommand {
protected void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception { protected void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception {
ItemStack is = user.getItemInHand(); ItemStack is = user.getItemInHand();
if (is.getType() == Material.AIR) { if (is == null || is.getType() == Material.AIR) {
user.sendMessage("Command can't be attached to air."); user.sendMessage("Command can't be attached to air.");
} }
String command = getFinalArg(args, 0); String command = getFinalArg(args, 0);