EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-12-13 20:48:46 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nossr50
2020-12-17 15:10:53 -08:00
parent 9e931f880e 2de52c7955
commit abcf6413f5
10 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java
View File

@@ -113,6 +113,7 @@ public final class AlchemyPotionBrewer {
}
List<AlchemyPotion> inputList = new ArrayList<>();
ItemStack[] outputList = new ItemStack[3];
for (int i = 0; i < 3; i++) {
ItemStack item = inventory.getItem(i);
@@ -127,7 +128,7 @@ public final class AlchemyPotionBrewer {
inputList.add(input);
if (output != null) {
inventory.setItem(i, output.toItemStack(item.getAmount()).clone());
outputList[i] = output.toItemStack(item.getAmount()).clone();
}
}
@@ -138,6 +139,12 @@ public final class AlchemyPotionBrewer {
return;
}
for (int i = 0; i < 3; i++) {
if(outputList[i] != null) {
inventory.setItem(i, outputList[i]);
}
}
removeIngredient(inventory, player);
for (AlchemyPotion input : inputList) {

1
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@@ -570,6 +570,7 @@ public class TamingManager extends SkillManager {
//Remove from existence
if(livingEntity != null && livingEntity.isValid()) {
mcMMO.getCompatibilityManager().getPersistentDataLayer().removeMobFlags(livingEntity);
livingEntity.setHealth(0);
livingEntity.remove();
}