diff options
| author | snowleo <schneeleo@gmail.com> | 2011-12-14 15:22:29 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-12-14 15:22:29 +0100 |
| commit | 503e837cfdf1eaf0a4ae8b04199fc1c60dd82923 (patch) | |
| tree | 83d555afe49c547516842c53f2d819e902c7734e | |
| parent | 0a98b8f662ff97924f9788a608ac1f8ee35a824c (diff) | |
| download | Essentials-503e837cfdf1eaf0a4ae8b04199fc1c60dd82923.tar Essentials-503e837cfdf1eaf0a4ae8b04199fc1c60dd82923.tar.gz Essentials-503e837cfdf1eaf0a4ae8b04199fc1c60dd82923.tar.lz Essentials-503e837cfdf1eaf0a4ae8b04199fc1c60dd82923.tar.xz Essentials-503e837cfdf1eaf0a4ae8b04199fc1c60dd82923.zip | |
Fail merge :D
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Trade.java | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/Trade.java index 51f1feccd..50e32d7bd 100644 --- a/Essentials/src/com/earth2me/essentials/Trade.java +++ b/Essentials/src/com/earth2me/essentials/Trade.java @@ -1,13 +1,10 @@ package com.earth2me.essentials; import com.earth2me.essentials.craftbukkit.InventoryWorkaround; -<<<<<<< HEAD import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.ISettings; -======= import com.earth2me.essentials.craftbukkit.SetExpFix; ->>>>>>> refs/heads/master import static com.earth2me.essentials.I18n._; import java.io.File; import java.io.FileWriter; @@ -90,16 +87,10 @@ public class Trade { throw new ChargeException(_("notEnoughMoney")); } -<<<<<<< HEAD if (exp != null && exp > 0 - && user.getTotalExperience() < exp) + && SetExpFix.getTotalExperience(user) < exp) { -======= - - if (exp != null && exp > 0 - && SetExpFix.getTotalExperience(user) < exp) { ->>>>>>> refs/heads/master throw new ChargeException(_("notEnoughExperience")); } } @@ -164,8 +155,8 @@ public class Trade && !user.isAuthorized("essentials.nocommandcost." + command)) { @Cleanup - final ISettings settings = ess.getSettings(); - settings.acquireReadLock(); + final ISettings settings = ess.getSettings(); + settings.acquireReadLock(); final double mon = user.getMoney(); final double cost = settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command); if (mon < cost && cost > 0 && !user.isAuthorized("essentials.eco.loan")) |