Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-22 04:37:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of

Browse Source 
http://Indyuce@dev.lumine.io/bitbucket/scm/mmo/mmoitems.git

Conflicts:
	lib/MMOCore.jar
	src/main/java/net/Indyuce/mmoitems/comp/mmocore/MMOCoreMMOLoader.java
This commit is contained in:
Indyuce 2020-07-20 16:25:38 +02:00
commit f193fdd706
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/MMOCore.jar
View File

Binary file not shown.

2
src/main/java/net/Indyuce/mmoitems/comp/mmocore/MMOCoreMMOLoader.java
View File

@ -22,11 +22,13 @@ import net.Indyuce.mmoitems.comp.mmocore.crafting.ExperienceCraftingTrigger;
import net.Indyuce.mmoitems.comp.mmocore.crafting.ProfessionCondition; import net.Indyuce.mmoitems.comp.mmocore.crafting.ProfessionCondition;
import net.Indyuce.mmoitems.comp.mmocore.load.GetMMOItemObjective; import net.Indyuce.mmoitems.comp.mmocore.load.GetMMOItemObjective;
import net.Indyuce.mmoitems.comp.mmocore.load.ItemTemplateDropItem; import net.Indyuce.mmoitems.comp.mmocore.load.ItemTemplateDropItem;
//import net.Indyuce.mmoitems.comp.mmocore.load.ItemTemplateDropItem;
import net.Indyuce.mmoitems.comp.mmocore.load.MMOItemDropItem; import net.Indyuce.mmoitems.comp.mmocore.load.MMOItemDropItem;
import net.Indyuce.mmoitems.comp.mmocore.load.MMOItemTrigger; import net.Indyuce.mmoitems.comp.mmocore.load.MMOItemTrigger;
import net.Indyuce.mmoitems.comp.mmocore.load.MMOItemsBlockType; import net.Indyuce.mmoitems.comp.mmocore.load.MMOItemsBlockType;
import net.Indyuce.mmoitems.comp.mmocore.load.MineMIBlockExperienceSource; import net.Indyuce.mmoitems.comp.mmocore.load.MineMIBlockExperienceSource;
import net.Indyuce.mmoitems.comp.mmocore.load.RandomItemDropItem; import net.Indyuce.mmoitems.comp.mmocore.load.RandomItemDropItem;
//import net.Indyuce.mmoitems.comp.mmocore.load.RandomItemDropItem;
import net.Indyuce.mmoitems.comp.mmocore.load.SmeltMMOItemExperienceSource; import net.Indyuce.mmoitems.comp.mmocore.load.SmeltMMOItemExperienceSource;
import net.Indyuce.mmoitems.stat.type.DoubleStat; import net.Indyuce.mmoitems.stat.type.DoubleStat;
import net.Indyuce.mmoitems.stat.type.ItemStat; import net.Indyuce.mmoitems.stat.type.ItemStat;

2
src/main/java/net/Indyuce/mmoitems/listener/CraftingListener.java
View File

@ -55,7 +55,7 @@ public class CraftingListener implements Listener {
} }
CachedRecipe cached = cachedRecipe.get(e.getWhoClicked().getUniqueId()); CachedRecipe cached = cachedRecipe.get(e.getWhoClicked().getUniqueId());
cachedRecipe.remove(e.getWhoClicked().getUniqueId()); cachedRecipe.remove(e.getWhoClicked().getUniqueId());
if (!cached.isValid(inv.getMatrix())) { if (!cached.isValid(inv.getMatrix()) || !e.getCurrentItem().isSimilar(cached.getResult())) {
e.setCancelled(true); e.setCancelled(true);
return; return;
} }