Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue with water and uncraftable.

Browse Source
This commit is contained in:
Olof Larsson 2016-03-14 18:36:50 +01:00
parent 54a83313b5
commit d676d231bd
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/com/massivecraft/massivecore/adapter/ItemStackAdapterInner19.java
View File

@ -21,7 +21,7 @@ public class ItemStackAdapterInner19 extends ItemStackAdapterInner18
// -------------------------------------------- // // -------------------------------------------- //
public static final String POTION = "potion"; public static final String POTION = "potion";
public static final PotionData POTION_DEFAULT = new PotionData(PotionType.UNCRAFTABLE, false, false); public static final PotionData POTION_DEFAULT = new PotionData(PotionType.WATER, false, false);
// -------------------------------------------- // // -------------------------------------------- //
// INSTANCE & CONSTRUCT // INSTANCE & CONSTRUCT
@ -59,9 +59,11 @@ public class ItemStackAdapterInner19 extends ItemStackAdapterInner18
if (meta2json) if (meta2json)
{ {
// Check Null and Default
PotionData potionData = meta.getBasePotionData(); PotionData potionData = meta.getBasePotionData();
if (potionData != null && ! potionData.equals(POTION_DEFAULT)) if (potionData != null && ! potionData.equals(POTION_DEFAULT))
{ {
// Check Null (silent on failure)
String potionString = toPotionString(potionData); String potionString = toPotionString(potionData);
if (potionString != null) if (potionString != null)
{ {
@ -71,6 +73,10 @@ public class ItemStackAdapterInner19 extends ItemStackAdapterInner18
} }
else else
{ {
// Create
PotionData target = null;
// Get by "potion"
JsonElement potionElement = json.get(POTION); JsonElement potionElement = json.get(POTION);
if (potionElement != null) if (potionElement != null)
{ {
@ -78,22 +84,34 @@ public class ItemStackAdapterInner19 extends ItemStackAdapterInner18
PotionData potionData = toPotionData(potionString); PotionData potionData = toPotionData(potionString);
if (potionData != null) if (potionData != null)
{ {
meta.setBasePotionData(potionData); target = potionData;
} }
return;
} }
JsonElement damageElement = json.get(DAMAGE); // Get by "damage"
if (damageElement != null) if (target == null)
{ {
int damage = damageElement.getAsInt(); JsonElement damageElement = json.get(DAMAGE);
PotionData potionData = toPotionData(damage); if (damageElement != null)
if (potionData != null)
{ {
meta.setBasePotionData(potionData); int damage = damageElement.getAsInt();
stack.setDurability((short) 0); PotionData potionData = toPotionData(damage);
if (potionData != null)
{
stack.setDurability((short) 0);
target = potionData;
}
} }
} }
// Get by POTION_DEFAULT
if (target == null)
{
target = POTION_DEFAULT;
}
// Set
meta.setBasePotionData(target);
} }
} }
@ -109,6 +127,14 @@ public class ItemStackAdapterInner19 extends ItemStackAdapterInner18
PotionType type = potion.getType(); PotionType type = potion.getType();
boolean extended = potion.hasExtendedDuration(); boolean extended = potion.hasExtendedDuration();
boolean upgraded = (potion.getLevel() >= 2); boolean upgraded = (potion.getLevel() >= 2);
// Try to avoid slow exceptions.
// The same checks are done in the PotionData constructor.
if (type == null) return null;
if (extended && ! type.isExtendable()) return null;
if (upgraded && ! type.isUpgradeable()) return null;
if (upgraded && extended) return null;
return new PotionData(type, extended, upgraded); return new PotionData(type, extended, upgraded);
} }
catch (Exception e) catch (Exception e)