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

More 1.21 fixes

Browse Source
This commit is contained in:
Jules 2024-07-25 21:06:32 -07:00
parent d7ff655c86
commit dcd1b55099
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/PluginInventory.java
View File

@ -1,8 +1,10 @@
package net.Indyuce.mmocore.gui.api; package net.Indyuce.mmocore.gui.api;
import io.lumine.mythic.lib.version.VersionUtils;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
public abstract class PluginInventory implements InventoryHolder { public abstract class PluginInventory implements InventoryHolder {
@ -11,8 +13,8 @@ public abstract class PluginInventory implements InventoryHolder {
public PluginInventory(Player player) { public PluginInventory(Player player) {
this.player = player; this.player = player;
this.playerData = player.getOpenInventory() != null && player.getOpenInventory().getTopInventory().getHolder() instanceof PluginInventory ? final Inventory open = VersionUtils.getOpen(player).getTopInventory();
((PluginInventory) player.getOpenInventory().getTopInventory().getHolder()).playerData : PlayerData.get(player); this.playerData = open.getHolder() instanceof PluginInventory ? ((PluginInventory) open.getHolder()).playerData : PlayerData.get(player);
} }
public PluginInventory(PlayerData playerData) { public PluginInventory(PlayerData playerData) {

11
MMOCore-API/src/main/java/net/Indyuce/mmocore/guild/provided/Guild.java
View File

@ -1,5 +1,7 @@
package net.Indyuce.mmocore.guild.provided; package net.Indyuce.mmocore.guild.provided;
import io.lumine.mythic.lib.version.VInventoryView;
import io.lumine.mythic.lib.version.VersionUtils;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.ConfigMessage; import net.Indyuce.mmocore.api.ConfigMessage;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
@ -63,7 +65,7 @@ public class Guild implements AbstractGuild {
// Disband boolean is to prevent co-modification exception when disbanding a guild // Disband boolean is to prevent co-modification exception when disbanding a guild
public void removeMember(UUID uuid, boolean disband) { public void removeMember(UUID uuid, boolean disband) {
PlayerData data = PlayerData.get(uuid); PlayerData data = PlayerData.get(uuid);
if (data != null && data.isOnline() && data.getPlayer().getOpenInventory() != null && data.getPlayer().getOpenInventory().getTopInventory().getHolder() instanceof EditableGuildView.GuildViewInventory) if (data.isOnline() && VersionUtils.getOpen(data.getPlayer()).getTopInventory().getHolder() instanceof EditableGuildView.GuildViewInventory)
InventoryManager.GUILD_CREATION.newInventory(data).open(); InventoryManager.GUILD_CREATION.newInventory(data).open();
if (!disband) if (!disband)
@ -102,9 +104,10 @@ public class Guild implements AbstractGuild {
public void reopenInventories() { public void reopenInventories() {
for (UUID uuid : members) { for (UUID uuid : members) {
PlayerData member = PlayerData.get(uuid); final PlayerData member = PlayerData.get(uuid);
if (member != null && member.isOnline() && member.getPlayer().getOpenInventory() != null && member.getPlayer().getOpenInventory().getTopInventory().getHolder() instanceof EditableGuildView.GuildViewInventory) final VInventoryView open = VersionUtils.getOpen(member.getPlayer());
((PluginInventory) member.getPlayer().getOpenInventory().getTopInventory().getHolder()).open(); if (member.isOnline() && open.getTopInventory().getHolder() instanceof EditableGuildView.GuildViewInventory)
((PluginInventory) open.getTopInventory().getHolder()).open();
} }
} }

14
MMOCore-API/src/main/java/net/Indyuce/mmocore/party/provided/Party.java
View File

@ -1,5 +1,7 @@
package net.Indyuce.mmocore.party.provided; package net.Indyuce.mmocore.party.provided;
import io.lumine.mythic.lib.version.VInventoryView;
import io.lumine.mythic.lib.version.VersionUtils;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.ConfigMessage; import net.Indyuce.mmocore.api.ConfigMessage;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
@ -99,8 +101,7 @@ public class Party implements AbstractParty {
} }
public void removeMember(PlayerData data, boolean notify) { public void removeMember(PlayerData data, boolean notify) {
if (data.isOnline() && data.getPlayer().getOpenInventory() != null if (data.isOnline() && VersionUtils.getOpen(data.getPlayer()).getTopInventory().getHolder() instanceof EditablePartyView.PartyViewInventory)
&& data.getPlayer().getOpenInventory().getTopInventory().getHolder() instanceof EditablePartyView.PartyViewInventory)
InventoryManager.PARTY_CREATION.newInventory(data).open(); InventoryManager.PARTY_CREATION.newInventory(data).open();
members.remove(data); members.remove(data);
@ -137,10 +138,11 @@ public class Party implements AbstractParty {
} }
private void updateOpenInventories() { private void updateOpenInventories() {
for (PlayerData member : members) for (PlayerData member : members) {
if (member.isOnline() && member.getPlayer().getOpenInventory() != null final VInventoryView open = VersionUtils.getOpen(member.getPlayer());
&& member.getPlayer().getOpenInventory().getTopInventory().getHolder() instanceof EditablePartyView.PartyViewInventory) if (member.isOnline() && open.getTopInventory().getHolder() instanceof EditablePartyView.PartyViewInventory)
((PluginInventory) member.getPlayer().getOpenInventory().getTopInventory().getHolder()).open(); ((PluginInventory) open.getTopInventory().getHolder()).open();
}
} }
@Deprecated @Deprecated

7
MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/GoldPouchesListener.java
View File

@ -1,6 +1,7 @@
package net.Indyuce.mmocore.listener; package net.Indyuce.mmocore.listener;
import io.lumine.mythic.lib.api.item.NBTItem; import io.lumine.mythic.lib.api.item.NBTItem;
import io.lumine.mythic.lib.version.VersionUtils;
import net.Indyuce.mmocore.gui.eco.GoldPouch; import net.Indyuce.mmocore.gui.eco.GoldPouch;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -43,11 +44,11 @@ public class GoldPouchesListener implements Listener {
if (!(event.getEntity() instanceof Player)) if (!(event.getEntity() instanceof Player))
return; return;
Player player = (Player) event.getEntity(); final Player player = (Player) event.getEntity();
if (player.getOpenInventory() == null || !(player.getOpenInventory().getTopInventory().getHolder() instanceof GoldPouch)) if (!(VersionUtils.getOpen(player).getTopInventory().getHolder() instanceof GoldPouch))
return; return;
ItemStack item = event.getItem().getItemStack(); final ItemStack item = event.getItem().getItemStack();
if (NBTItem.get(item).hasTag("RpgPouchInventory")) if (NBTItem.get(item).hasTag("RpgPouchInventory"))
event.setCancelled(true); event.setCancelled(true);
} }