minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-10-02 00:56:55 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:essentials/Essentials

Browse Source 
Conflicts:
	Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
	Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
This commit is contained in:
KHobbits
2011-12-01 13:47:06 +00:00
parent 9a172c79f1 db9df18231
commit c3fa56bc67
67 changed files with 599 additions and 2343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
View File

@@ -3,7 +3,6 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;
import com.earth2me.essentials.craftbukkit.EnchantmentFix;
import java.util.*;
import java.util.regex.Pattern;
import org.bukkit.Server;
@@ -109,7 +108,7 @@ public class Commandenchant extends EssentialsCommand
} else {
stack.addEnchantment(enchantment, level);
}
EnchantmentFix.setItemInHand(user.getInventory(), stack);
user.getInventory().setItemInHand(stack);
user.updateInventory();
final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
if (level == 0) {