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

Vampirism can now be enabled without having Skill Death Penalty enabled

Browse Source
This commit is contained in:
TfT_02
2013-08-21 19:15:17 +02:00
parent 0455416dec
commit 0ce41150c6
4 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
View File

@ -123,7 +123,7 @@ public class PlayerListener implements Listener {
*/
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerDeathMonitor(PlayerDeathEvent event) {
if (!HardcoreManager.getHardcoreStatLossEnabled()) {
if (!HardcoreManager.getHardcoreStatLossEnabled() && !HardcoreManager.getHardcoreVampirismEnabled()) {
return;
}
@ -139,7 +139,9 @@ public class PlayerListener implements Listener {
HardcoreManager.invokeVampirism(killer, killedPlayer);
}
HardcoreManager.invokeStatPenalty(killedPlayer);
if (HardcoreManager.getHardcoreStatLossEnabled()) {
HardcoreManager.invokeStatPenalty(killedPlayer);
}
}
/**

40
src/main/java/com/gmail/nossr50/util/Motd.java
View File

@ -30,7 +30,7 @@ public final class Motd {
/**
* Display version info.
*
* @param player Target player
* @param player Target player
* @param version Plugin version
*/
public static void displayVersion(Player player, String version) {
@ -43,16 +43,32 @@ public final class Motd {
* @param player Target player
*/
public static void displayHardcoreSettings(Player player) {
if (HardcoreManager.getHardcoreStatLossEnabled()) {
if (HardcoreManager.getHardcoreVampirismEnabled()) {
player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.VampireOn"));
player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.Stats", Config.getInstance().getHardcoreDeathStatPenaltyPercentage()));
player.sendMessage(LocaleLoader.getString("MOTD.Vampire.Stats", Config.getInstance().getHardcoreVampirismStatLeechPercentage()));
}
else {
player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.VampireOff"));
player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.Stats", Config.getInstance().getHardcoreDeathStatPenaltyPercentage()));
}
if (!HardcoreManager.getHardcoreStatLossEnabled() && !HardcoreManager.getHardcoreVampirismEnabled()) {
return;
}
String enabledModes;
boolean deathStatLossEnabled = HardcoreManager.getHardcoreStatLossEnabled();
boolean vampirismEnabled = HardcoreManager.getHardcoreVampirismEnabled();
if (deathStatLossEnabled && vampirismEnabled) {
enabledModes = LocaleLoader.getString("Hardcore.DeathStatLoss.Name") + " & " + LocaleLoader.getString("Hardcore.Vampirism.Name");
}
else if (deathStatLossEnabled) {
enabledModes = LocaleLoader.getString("Hardcore.DeathStatLoss.Name");
}
else {
enabledModes = LocaleLoader.getString("Hardcore.Vampirism.Name");
}
player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.Enabled", enabledModes));
if (deathStatLossEnabled) {
player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.DeathStatLoss.Stats", Config.getInstance().getHardcoreDeathStatPenaltyPercentage()));
}
if (vampirismEnabled) {
player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.Vampirism.Stats", Config.getInstance().getHardcoreVampirismStatLeechPercentage()));
}
}
@ -113,7 +129,7 @@ public final class Motd {
/**
* Display website info.
*
* @param player Target player
* @param player Target player
* @param website Plugin website
*/
public static void displayWebsite(Player player, String website) {