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

Changed Berserk to add items to inventory rather than denying pickup

Browse Source
This commit is contained in:
GJ 2013-04-16 23:44:41 -04:00
parent 49bf190895
commit 2be3e3b43c
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -22,6 +22,7 @@ Version 1.4.06-dev
= Fixed bug where experience commands were adding levels to all skills when they shouldn't = Fixed bug where experience commands were adding levels to all skills when they shouldn't
= Fixed mcmmo.commands.ptp.send not being set by default = Fixed mcmmo.commands.ptp.send not being set by default
= Fixed NPE when trying to tab-complete /mctop = Fixed NPE when trying to tab-complete /mctop
! Changed Berserk to add items to inventory rather than denying pickup
! Changed Chimaera Wing's recipe result to use the ingredient Material ! Changed Chimaera Wing's recipe result to use the ingredient Material
! Players will no longer pickup items to their hotbar while using Unarmed ! Players will no longer pickup items to their hotbar while using Unarmed
! ExperienceAPI methods will now throw InvalidSkillException if the skill name passed in is invalid. ! ExperienceAPI methods will now throw InvalidSkillException if the skill name passed in is invalid.

1
src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java
View File

@ -23,7 +23,6 @@ public class McrefreshCommand extends ToggleCommand {
mcMMOPlayer.resetToolPrepMode(); mcMMOPlayer.resetToolPrepMode();
mcMMOPlayer.resetAbilityMode(); mcMMOPlayer.resetAbilityMode();
player.setCanPickupItems(true);
player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh")); player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
} }

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

@ -242,7 +242,7 @@ public class PlayerListener implements Listener {
} }
} }
if (mcMMOPlayer.isUsingUnarmed() && ItemUtils.isShareable(dropStack)) { if ((mcMMOPlayer.isUsingUnarmed() && ItemUtils.isShareable(dropStack)) || mcMMOPlayer.getAbilityMode(AbilityType.BERSERK)) {
event.setCancelled(Unarmed.handleItemPickup(player.getInventory(), drop)); event.setCancelled(Unarmed.handleItemPickup(player.getInventory(), drop));
if (event.isCancelled()) { if (event.isCancelled()) {
@ -265,10 +265,6 @@ public class PlayerListener implements Listener {
return; return;
} }
if (UserManager.getPlayer(player).getAbilityMode(AbilityType.BERSERK)) {
player.setCanPickupItems(true);
}
/* GARBAGE COLLECTION */ /* GARBAGE COLLECTION */
BleedTimerTask.bleedOut(player); // Bleed it out BleedTimerTask.bleedOut(player); // Bleed it out
} }
@ -282,10 +278,6 @@ public class PlayerListener implements Listener {
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (UserManager.getPlayer(player).getAbilityMode(AbilityType.BERSERK)) {
player.setCanPickupItems(false);
}
if (Config.getInstance().getMOTDEnabled() && Permissions.motd(player)) { if (Config.getInstance().getMOTDEnabled() && Permissions.motd(player)) {
Motd.displayAll(player); Motd.displayAll(player);
} }

10
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
View File

@ -180,10 +180,7 @@ public class SkillUtils {
if (ability.getPermissions(player)) { if (ability.getPermissions(player)) {
if (mcMMOPlayer.getAbilityMode(ability) && (mcMMOPlayer.getProfile().getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR) <= curTime) { if (mcMMOPlayer.getAbilityMode(ability) && (mcMMOPlayer.getProfile().getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR) <= curTime) {
if (ability == AbilityType.BERSERK) { if (ability == AbilityType.SUPER_BREAKER || ability == AbilityType.GIGA_DRILL_BREAKER) {
player.setCanPickupItems(true);
}
else if (ability == AbilityType.SUPER_BREAKER || ability == AbilityType.GIGA_DRILL_BREAKER) {
handleAbilitySpeedDecrease(player); handleAbilitySpeedDecrease(player);
} }
@ -404,10 +401,7 @@ public class SkillUtils {
playerProfile.setSkillDATS(ability, System.currentTimeMillis() + (ticks * Misc.TIME_CONVERSION_FACTOR)); playerProfile.setSkillDATS(ability, System.currentTimeMillis() + (ticks * Misc.TIME_CONVERSION_FACTOR));
mcMMOPlayer.setAbilityMode(ability, true); mcMMOPlayer.setAbilityMode(ability, true);
if (ability == AbilityType.BERSERK) { if (ability == AbilityType.SUPER_BREAKER || ability == AbilityType.GIGA_DRILL_BREAKER) {
player.setCanPickupItems(false);
}
else if (ability == AbilityType.SUPER_BREAKER || ability == AbilityType.GIGA_DRILL_BREAKER) {
handleAbilitySpeedIncrease(player); handleAbilitySpeedIncrease(player);
} }
} }