From c59473502f9888b86b7505165684633139291178 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Sun, 26 Mar 2023 21:14:29 +0100 Subject: [PATCH 1/2] Fixed issue #750 about custom model data in Atribute view. --- .../java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java index df1d90f3..f585e5dc 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java @@ -130,7 +130,7 @@ public abstract class InventoryItem { } public ItemStack display(T inv) { - return display(inv, 0); + return display(inv, modelData); } public ItemStack display(T inv, int n) { @@ -138,7 +138,7 @@ public abstract class InventoryItem { } public ItemStack display(T inv, int n, Material specificMaterial) { - return display(inv, n, specificMaterial, 0); + return display(inv, n, specificMaterial, modelData); } public ItemStack display(T inv, int n, Material specificMaterial, int modelData) { From 0bc1837460baa2869e31dfb51c9611d693be6990 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Sun, 26 Mar 2023 21:14:52 +0100 Subject: [PATCH 2/2] Fixed issue #765 about stellium saving issues when switching server. --- .../mmocore/manager/data/mysql/MMOCoreDataSynchronizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MMOCoreDataSynchronizer.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MMOCoreDataSynchronizer.java index 1364026b..cdeca154 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MMOCoreDataSynchronizer.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MMOCoreDataSynchronizer.java @@ -121,7 +121,7 @@ public class MMOCoreDataSynchronizer extends DataSynchronizer { //These should be loaded after to make sure that the MAX_MANA, MAX_STAMINA & MAX_STELLIUM stats are already loaded. data.setMana(result.getDouble("mana")); data.setStamina(result.getDouble("stamina")); - data.setStellium(result.getDouble("stamina")); + data.setStellium(result.getDouble("stellium")); double health = result.getDouble("health"); health = health == 0 ? 20 : health; health = Math.min(health, data.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue());