EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 02:53:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug where teleport location was never reset if warmup was set to 0

Browse Source 
for Chimera Wing.

Fixes #1323
This commit is contained in:
GJ
2013-07-30 15:20:18 -04:00
parent a345737b8b
commit d1bf48ad79
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java
View File

@@ -29,8 +29,6 @@ public class ChimaeraWingWarmup extends BukkitRunnable {
Player player = mcMMOPlayer.getPlayer(); Player player = mcMMOPlayer.getPlayer();
Location previousLocation = mcMMOPlayer.getTeleportCommenceLocation(); Location previousLocation = mcMMOPlayer.getTeleportCommenceLocation();
mcMMOPlayer.setTeleportCommenceLocation(null);
if (player.getLocation().distanceSquared(previousLocation) > 1.0 || !player.getInventory().containsAtLeast(ChimaeraWing.getChimaeraWing(0), 1)) { if (player.getLocation().distanceSquared(previousLocation) > 1.0 || !player.getInventory().containsAtLeast(ChimaeraWing.getChimaeraWing(0), 1)) {
player.sendMessage(LocaleLoader.getString("Teleport.Cancelled")); player.sendMessage(LocaleLoader.getString("Teleport.Cancelled"));
return; return;

1
src/main/java/com/gmail/nossr50/util/ChimaeraWing.java
View File

@@ -133,6 +133,7 @@ public final class ChimaeraWing {
player.setItemInHand(new ItemStack(getChimaeraWing(player.getItemInHand().getAmount() - Config.getInstance().getChimaeraUseCost()))); player.setItemInHand(new ItemStack(getChimaeraWing(player.getItemInHand().getAmount() - Config.getInstance().getChimaeraUseCost())));
player.updateInventory(); player.updateInventory();
mcMMOPlayer.actualizeChimeraWingLastUse(); mcMMOPlayer.actualizeChimeraWingLastUse();
mcMMOPlayer.setTeleportCommenceLocation(null);
if (Config.getInstance().getStatsTrackingEnabled()) { if (Config.getInstance().getStatsTrackingEnabled()) {
MetricsManager.chimeraWingUsed(); MetricsManager.chimeraWingUsed();
} }