EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Add option for Chimaera Wings to ignore bed spawns

Browse Source 
Adds #2365
This commit is contained in:
TfT_02 2014-12-18 23:04:38 +01:00
parent b44b1cc859
commit 262e711bcc
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -8,6 +8,7 @@ Key:
- Removal - Removal
Version 1.5.02-dev Version 1.5.02-dev
+ Added option to config.yml for Chimaera Wings to stop using bed spawn points
Version 1.5.01 Version 1.5.01
+ Added new child skill; Salvage + Added new child skill; Salvage

1
src/main/java/com/gmail/nossr50/config/Config.java
View File

@ -372,6 +372,7 @@ public class Config extends AutoUpdateConfigLoader {
public Material getChimaeraItem() { return Material.matchMaterial(config.getString("Items.Chimaera_Wing.Item_Name", "Feather")); } public Material getChimaeraItem() { return Material.matchMaterial(config.getString("Items.Chimaera_Wing.Item_Name", "Feather")); }
public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); } public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); }
public boolean getChimaeraPreventUseUnderground() { return config.getBoolean("Items.Chimaera_Wing.Prevent_Use_Underground", true); } public boolean getChimaeraPreventUseUnderground() { return config.getBoolean("Items.Chimaera_Wing.Prevent_Use_Underground", true); }
public boolean getChimaeraUseBedSpawn() { return config.getBoolean("Items.Chimaera_Wing.Use_Bed_Spawn", true); }
public int getChimaeraCooldown() { return config.getInt("Items.Chimaera_Wing.Cooldown", 240); } public int getChimaeraCooldown() { return config.getInt("Items.Chimaera_Wing.Cooldown", 240); }
public int getChimaeraWarmup() { return config.getInt("Items.Chimaera_Wing.Warmup", 5); } public int getChimaeraWarmup() { return config.getInt("Items.Chimaera_Wing.Warmup", 5); }
public int getChimaeraRecentlyHurtCooldown() { return config.getInt("Items.Chimaera_Wing.RecentlyHurt_Cooldown", 60); } public int getChimaeraRecentlyHurtCooldown() { return config.getInt("Items.Chimaera_Wing.RecentlyHurt_Cooldown", 60); }

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

@ -117,7 +117,7 @@ public final class ChimaeraWing {
public static void chimaeraExecuteTeleport() { public static void chimaeraExecuteTeleport() {
Player player = mcMMOPlayer.getPlayer(); Player player = mcMMOPlayer.getPlayer();
if (player.getBedSpawnLocation() != null) { if (Config.getInstance().getChimaeraUseBedSpawn() && player.getBedSpawnLocation() != null) {
player.teleport(player.getBedSpawnLocation()); player.teleport(player.getBedSpawnLocation());
} }
else { else {

2
src/main/resources/config.yml
View File

@ -207,6 +207,8 @@ Items:
Warmup: 5 Warmup: 5
RecentlyHurt_Cooldown: 60 RecentlyHurt_Cooldown: 60
Prevent_Use_Underground: true Prevent_Use_Underground: true
# Attempt to use the bed spawn, if one is available
Use_Bed_Spawn: true
Use_Cost: 1 Use_Cost: 1
Recipe_Cost: 5 Recipe_Cost: 5
Item_Name: FEATHER Item_Name: FEATHER