Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows

This commit is contained in:
nossr50 2020-07-30 13:18:20 -07:00
commit 2020fdd4ea
3 changed files with 13 additions and 1 deletions

View File

@ -48,6 +48,9 @@ Version 2.2.000
Notes: Notes:
These are the first new skills that I've written for mcMMO in about 9 years, I'll be listening closely to feedback and tweaking them often. These are the first new skills that I've written for mcMMO in about 9 years, I'll be listening closely to feedback and tweaking them often.
Version 2.1.137
Added some code to avoid NPE errors when checking armor on entities
Version 2.1.136 Version 2.1.136
Furnace ownership is no longer lost when the furnace stops doing a job Furnace ownership is no longer lost when the furnace stops doing a job
Furnaces remember owners between restarts (requires MC 1.14 or higher) Furnaces remember owners between restarts (requires MC 1.14 or higher)

View File

@ -23,10 +23,13 @@ public class Axes {
public static double skullSplitterModifier = AdvancedConfig.getInstance().getSkullSplitterModifier(); public static double skullSplitterModifier = AdvancedConfig.getInstance().getSkullSplitterModifier();
protected static boolean hasArmor(LivingEntity target) { protected static boolean hasArmor(LivingEntity target) {
if(target.getEquipment() == null) if(target == null || !target.isValid() || target.getEquipment() == null)
return false; return false;
for (ItemStack itemStack : target.getEquipment().getArmorContents()) { for (ItemStack itemStack : target.getEquipment().getArmorContents()) {
if(itemStack == null)
continue;
if (ItemUtils.isArmor(itemStack)) { if (ItemUtils.isArmor(itemStack)) {
return true; return true;
} }

View File

@ -92,6 +92,12 @@ public class SmeltingTracker {
if(!Permissions.skillEnabled(player, PrimarySkillType.SMELTING)) if(!Permissions.skillEnabled(player, PrimarySkillType.SMELTING))
return; return;
//Don't swap ownership if its the same player
if(getFurnaceOwner(furnace) != null) {
if(getFurnaceOwner(furnace).getUniqueId().equals(player.getUniqueId()))
return;
}
changeFurnaceOwnership(furnace, player); changeFurnaceOwnership(furnace, player);
} }
} }