Replace #408

Elikill58 · Nov 29, 2023 · a0dcf36 · a0dcf36
1 parent fea8e03
commit a0dcf36
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/common/src/com/elikill58/negativity/api/inventory/AbstractInventory.java b/common/src/com/elikill58/negativity/api/inventory/AbstractInventory.java
@@ -10,7 +10,10 @@
 
 public abstract class AbstractInventory<T extends NegativityHolder> {
 
- public static final List<AbstractInventory<?>> INVENTORIES = new ArrayList<>();
+ private static final List<AbstractInventory<?>> INVENTORIES = new ArrayList<>();
+ public static List<AbstractInventory<?>> getInventories() {
+ return INVENTORIES;
+ }
 
  private final NegativityInventory type;
  private final Class<T> holderExample;

diff --git a/common/src/com/elikill58/negativity/api/inventory/InventoryManager.java b/common/src/com/elikill58/negativity/api/inventory/InventoryManager.java
@@ -71,7 +71,7 @@ public InventoryManager() {
  new WarnProcessorManagerInventory();
  new SeeWarnInventory();
  new SeeProofInventory();
- AbstractInventory.INVENTORIES.forEach(AbstractInventory::load);
+ AbstractInventory.getInventories().forEach(AbstractInventory::load);
  }
 
  @SuppressWarnings({ "rawtypes" })
@@ -81,7 +81,7 @@ public void onInventoryClick(InventoryClickEvent e) {
  if(!(holder instanceof NegativityHolder)) 
  return;
  NegativityHolder nh = ((NegativityHolder) holder).getBasicHolder();
- for(AbstractInventory inv : AbstractInventory.INVENTORIES) {
+ for(AbstractInventory inv : AbstractInventory.getInventories()) {
  if(inv.isInstance(nh)) {
  e.setCancelled(true);
  Player p = e.getPlayer();
@@ -97,7 +97,7 @@ public void onInventoryClick(InventoryClickEvent e) {
  }
 
  public static Optional<AbstractInventory<?>> getInventory(NegativityInventory type) {
- for(AbstractInventory<?> inv : AbstractInventory.INVENTORIES)
+ for(AbstractInventory<?> inv : AbstractInventory.getInventories())
  if(inv.getType().equals(type))
  return Optional.of(inv);
  return Optional.empty();

diff --git a/common/src/com/elikill58/negativity/common/ConnectionManager.java b/common/src/com/elikill58/negativity/common/ConnectionManager.java
@@ -10,13 +10,18 @@
 import com.elikill58.negativity.api.entity.Player;
 import com.elikill58.negativity.api.events.EventListener;
 import com.elikill58.negativity.api.events.Listeners;
+import com.elikill58.negativity.api.events.inventory.InventoryCloseEvent;
 import com.elikill58.negativity.api.events.player.LoginEvent;
 import com.elikill58.negativity.api.events.player.PlayerChatEvent;
 import com.elikill58.negativity.api.events.player.LoginEvent.Result;
+import com.elikill58.negativity.api.inventory.InventoryManager;
+import com.elikill58.negativity.api.inventory.InventoryType;
+import com.elikill58.negativity.api.inventory.AbstractInventory.NegativityInventory;
 import com.elikill58.negativity.api.events.player.PlayerConnectEvent;
 import com.elikill58.negativity.api.events.player.PlayerLeaveEvent;
 import com.elikill58.negativity.api.events.player.PlayerTeleportEvent;
 import com.elikill58.negativity.common.commands.ReportCommand;
+import com.elikill58.negativity.common.inventories.hook.players.GlobalPlayerInventory;
 import com.elikill58.negativity.universal.Adapter;
 import com.elikill58.negativity.universal.Messages;
 import com.elikill58.negativity.universal.SanctionnerType;
@@ -136,11 +141,24 @@ public void onTeleport(PlayerTeleportEvent e) {
 
  @EventListener
  public void onLeft(PlayerLeaveEvent e) {
- WebhookManager.getWebhooks().forEach(w -> w.clean(e.getPlayer()));
+ Player p = e.getPlayer();
+ WebhookManager.getWebhooks().forEach(w -> w.clean(p));
+ GlobalPlayerInventory.PLAYER_SEE_PLAYER_INV.remove(p.getUniqueId());
  }
 
  @EventListener
  public void onMessage(PlayerChatEvent e) {
  Stats.updateMessage(NegativityPlayer.getNegativityPlayer(e.getPlayer()), e.getMessage());
  }
+
+ @EventListener
+ public void onInventoryClose(InventoryCloseEvent e) {
+ Player p = e.getPlayer();
+ if(e.getInventory().getType().equals(InventoryType.PLAYER)) {
+ Player cible = GlobalPlayerInventory.PLAYER_SEE_PLAYER_INV.get(p.getUniqueId());
+ if(cible == null)
+ return;
+ InventoryManager.open(NegativityInventory.GLOBAL_PLAYER, p, cible);
+ }
+ }
 }
diff --git a/...n/src/com/elikill58/negativity/common/inventories/hook/players/GlobalPlayerInventory.java b/...n/src/com/elikill58/negativity/common/inventories/hook/players/GlobalPlayerInventory.java
@@ -4,7 +4,9 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.UUID;
 
 import com.elikill58.negativity.api.NegativityPlayer;
 import com.elikill58.negativity.api.colors.ChatColor;
@@ -30,6 +32,8 @@
 
 public class GlobalPlayerInventory extends AbstractInventory<CheckMenuHolder> {
 
+ public static final HashMap<UUID, Player> PLAYER_SEE_PLAYER_INV = new HashMap<>();
+
  public GlobalPlayerInventory() {
  super(NegativityInventory.GLOBAL_PLAYER, CheckMenuHolder.class);
  }
@@ -150,6 +154,7 @@ public void manageInventory(InventoryClickEvent e, Material m, Player p, CheckMe
  p.closeInventory();
  } else if(m.equals(Materials.SPIDER_EYE)){
  p.openInventory(cible.getInventory());
+ PLAYER_SEE_PLAYER_INV.put(p.getUniqueId(), cible);
  } else if(m.equals(Materials.TNT)) {
  InventoryManager.open(NegativityInventory.ACTIVED_CHEAT, p, cible);
  } else if(m.equals(Materials.PACKED_ICE)) {