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

two deflect bugs down

Browse Source
This commit is contained in:
nossr50 2020-08-25 16:14:08 -07:00
parent 56abad5360
commit e4c5a3b8ee
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog.txt
View File

@ -1,11 +1,14 @@
Version 2.1.144 Version 2.1.144
Fixed a bug where Deflect worked against non-arrow projectiles
Fixed a bug where Deflect was checked twice, resulting in two chances to deflect effectively
Fixed a bug where Roll wouldn't award XP when fall height was over a certain amount Fixed a bug where Roll wouldn't award XP when fall height was over a certain amount
Lowered the XP ceiling of Roll Lowered the XP ceiling of Roll
Fixed a NPE that would happen involving taming in combat processing Fixed a NPE that would happen involving taming in combat processing
Updated hu_HU locale (thanks andris155) Updated hu_HU locale (thanks andris155)
mmodebug mode now prints some information when fuel efficiency is applied to a furnace mmodebug mode now prints some information when fuel efficiency is applied to a furnace
NOTES:
I seem to consistently find old bugs in mcMMO, this deflect bug where it was checked twice, who knows how many years its been in mcMMO, I didn't check but its probably between 5-7.
Version 2.1.143 Version 2.1.143
mcMMO now tracks super ability boosted items through persistent metadata mcMMO now tracks super ability boosted items through persistent metadata

2
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -388,7 +388,7 @@ public class EntityListener implements Listener {
UnarmedManager unarmedManager = mcMMOPlayer.getUnarmedManager(); UnarmedManager unarmedManager = mcMMOPlayer.getUnarmedManager();
if (unarmedManager.canDeflect()) { if (unarmedManager.canDeflect()) {
if (unarmedManager.deflectCheck()) { if (projectile instanceof Arrow && unarmedManager.deflectCheck()) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }

12
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -256,18 +256,6 @@ public final class CombatUtils {
double finalDamage = event.getDamage(); double finalDamage = event.getDamage();
if (target instanceof Player && PrimarySkillType.UNARMED.getPVPEnabled()) {
UnarmedManager unarmedManager = UserManager.getPlayer((Player) target).getUnarmedManager();
if (unarmedManager.canDeflect()) {
event.setCancelled(unarmedManager.deflectCheck());
if (event.isCancelled()) {
return;
}
}
}
if (archeryManager.canSkillShot()) { if (archeryManager.canSkillShot()) {
//Not Additive //Not Additive
finalDamage = archeryManager.skillShot(initialDamage); finalDamage = archeryManager.skillShot(initialDamage);