Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Jules 2023-03-26 23:56:54 +02:00
commit e8fe24ba73
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java
View File

@ -130,7 +130,7 @@ public abstract class InventoryItem<T extends GeneratedInventory> {
} }
public ItemStack display(T inv) { public ItemStack display(T inv) {
return display(inv, 0); return display(inv, modelData);
} }
public ItemStack display(T inv, int n) { public ItemStack display(T inv, int n) {
@ -138,7 +138,7 @@ public abstract class InventoryItem<T extends GeneratedInventory> {
} }
public ItemStack display(T inv, int n, Material specificMaterial) { 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) { public ItemStack display(T inv, int n, Material specificMaterial, int modelData) {

2
MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MMOCoreDataSynchronizer.java
View File

@ -124,7 +124,7 @@ public class MMOCoreDataSynchronizer extends DataSynchronizer {
*/ */
data.setMana(result.getDouble("mana")); data.setMana(result.getDouble("mana"));
data.setStamina(result.getDouble("stamina")); data.setStamina(result.getDouble("stamina"));
data.setStellium(result.getDouble("stamina")); data.setStellium(result.getDouble("stellium"));
double health = result.getDouble("health"); double health = result.getDouble("health");
health = health == 0 ? data.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() : health; health = health == 0 ? data.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() : health;
health = Math.max(Math.min(health, data.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()), 0); health = Math.max(Math.min(health, data.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()), 0);