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

Fix warp sign costs.

Browse Source
This commit is contained in:
KHobbits
2014-02-25 07:09:32 +00:00
parent 55956c5490
commit 6d9ed5f90a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Essentials/src/com/earth2me/essentials/Teleport.java
View File

@@ -3,6 +3,7 @@ package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.LocationUtil; import com.earth2me.essentials.utils.LocationUtil;
import java.math.BigDecimal;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import net.ess3.api.IEssentials; import net.ess3.api.IEssentials;
@@ -171,8 +172,8 @@ public class Teleport implements net.ess3.api.ITeleport
{ {
double delay = ess.getSettings().getTeleportDelay(); double delay = ess.getSettings().getTeleportDelay();
Trade cashCharge = null; Trade cashCharge = chargeFor;
if (chargeFor != null) if (chargeFor != null && !chargeFor.getCommandCost(teleportOwner).equals(BigDecimal.ZERO))
{ {
chargeFor.isAffordableFor(teleportOwner); chargeFor.isAffordableFor(teleportOwner);
cashCharge = new Trade(chargeFor.getCommandCost(teleportOwner), ess); cashCharge = new Trade(chargeFor.getCommandCost(teleportOwner), ess);

3
Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
View File

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import net.ess3.api.IEssentials; import net.ess3.api.IEssentials;
import net.ess3.api.MaxMoneyException; import net.ess3.api.MaxMoneyException;
import net.ess3.api.events.SignBreakEvent; import net.ess3.api.events.SignBreakEvent;
@@ -600,7 +601,7 @@ public class EssentialsSign
return builder.toString(); return builder.toString();
//return event.getLine(index); // Above code can be removed and replaced with this line when https://github.com/Bukkit/Bukkit/pull/982 is merged. //return event.getLine(index); // Above code can be removed and replaced with this line when https://github.com/Bukkit/Bukkit/pull/982 is merged.
} }
@Override @Override
public final void setLine(final int index, final String text) public final void setLine(final int index, final String text)
{ {