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-09 17:54:01 +01:00
commit 42f583ac8d
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/adaptor/ThreeDimAdaptor.java
View File

@ -368,10 +368,8 @@ public class ThreeDimAdaptor extends Adaptor {
.getEntityFromID(event.getPlayer().getWorld(), packet.getIntegers().read(0)); .getEntityFromID(event.getPlayer().getWorld(), packet.getIntegers().read(0));
if (entity instanceof ArmorStand armorStand) { if (entity instanceof ArmorStand armorStand) {
if (true) { if (true) {
Bukkit.broadcastMessage("IN");
if (armorStands.values().contains(armorStand)) { if (armorStands.values().contains(armorStand)) {
Bukkit.broadcastMessage("CANCEL" + armorStand.getName());
event.setCancelled(true); event.setCancelled(true);
} }
} }

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

@ -146,7 +146,6 @@ public abstract class InventoryItem<T extends GeneratedInventory> {
Placeholders placeholders = getPlaceholders(inv, n); Placeholders placeholders = getPlaceholders(inv, n);
ItemStack item = new ItemStack(specificMaterial == null ? material : specificMaterial); ItemStack item = new ItemStack(specificMaterial == null ? material : specificMaterial);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setCustomModelData(modelData);
if (texture != null && meta instanceof SkullMeta) if (texture != null && meta instanceof SkullMeta)
applyTexture(texture, (SkullMeta) meta); applyTexture(texture, (SkullMeta) meta);
@ -163,7 +162,7 @@ public abstract class InventoryItem<T extends GeneratedInventory> {
} }
if (MythicLib.plugin.getVersion().isStrictlyHigher(1, 13)) if (MythicLib.plugin.getVersion().isStrictlyHigher(1, 13))
meta.setCustomModelData(getModelData()); meta.setCustomModelData(modelData);
item.setItemMeta(meta); item.setItemMeta(meta);
return item; return item;

9
MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java
View File

@ -44,10 +44,6 @@ public class YAMLPlayerDataManager extends PlayerDataManager {
if (config.contains("class")) if (config.contains("class"))
data.setClass(MMOCore.plugin.classManager.get(config.getString("class"))); data.setClass(MMOCore.plugin.classManager.get(config.getString("class")));
data.setMana(config.contains("mana") ? config.getDouble("mana") : data.getStats().getStat("MAX_MANA"));
data.setStamina(config.contains("stamina") ? config.getDouble("stamina") : data.getStats().getStat("MAX_STAMINA"));
data.setStellium(config.contains("stellium") ? config.getDouble("stellium") : data.getStats().getStat("MAX_STELLIUM"));
if (config.contains("guild")) { if (config.contains("guild")) {
Guild guild = provider.getGuildManager().getGuild(config.getString("guild")); Guild guild = provider.getGuildManager().getGuild(config.getString("guild"));
data.setGuild(guild.hasMember(data.getUniqueId()) ? guild : null); data.setGuild(guild.hasMember(data.getUniqueId()) ? guild : null);
@ -117,6 +113,11 @@ public class YAMLPlayerDataManager extends PlayerDataManager {
} }
//These should be loaded after to make sure that the MAX_MANA, MAX_STAMINA & MAX_STELLIUM stats are already loaded.
data.setMana(config.contains("mana") ? config.getDouble("mana") : data.getStats().getStat("MAX_MANA"));
data.setStamina(config.contains("stamina") ? config.getDouble("stamina") : data.getStats().getStat("MAX_STAMINA"));
data.setStellium(config.contains("stellium") ? config.getDouble("stellium") : data.getStats().getStat("MAX_STELLIUM"));
data.setFullyLoaded(); data.setFullyLoaded();
} }

2
MMOCore-Dist/src/main/resources/default/professions/fishing.yml
View File

@ -22,7 +22,7 @@ exp-sources: {}
on-fish: on-fish:
overriding-drop-table: overriding-drop-table:
conditions: conditions:
- 'region{name=swamp,second-region}' - 'region{name="swamp,second-region"}'
- 'biome{name=beach}' - 'biome{name=beach}'
# When drop table is read, one of these # When drop table is read, one of these