From dd02355ac24a31ff777bb33820bd8dcf23014939 Mon Sep 17 00:00:00 2001 From: Jikoo Date: Tue, 3 Dec 2019 13:50:27 -0500 Subject: [PATCH] Properly remove SilentContainer viewers Closes #115 --- .../lishid/openinv/internal/v1_13_R2/AnySilentContainer.java | 2 ++ .../lishid/openinv/internal/v1_14_R1/AnySilentContainer.java | 2 ++ .../com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/AnySilentContainer.java b/internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/AnySilentContainer.java index e8c1287..4b32bc9 100644 --- a/internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/AnySilentContainer.java +++ b/internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/AnySilentContainer.java @@ -286,6 +286,8 @@ public class AnySilentContainer implements IAnySilentContainer { EnumGamemode gamemode = player.playerInteractManager.getGameMode(); this.forceGameMode(player, EnumGamemode.SPECTATOR); player.activeContainer.b(player); + player.activeContainer.a(player, false); + player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity()); player.activeContainer = player.defaultContainer; this.forceGameMode(player, gamemode); } diff --git a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java index 0179147..8f580b2 100644 --- a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java +++ b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java @@ -309,6 +309,8 @@ public class AnySilentContainer implements IAnySilentContainer { EnumGamemode gamemode = player.playerInteractManager.getGameMode(); this.forceGameMode(player, EnumGamemode.SPECTATOR); player.activeContainer.b(player); + player.activeContainer.a(player, false); + player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity()); player.activeContainer = player.defaultContainer; this.forceGameMode(player, gamemode); } diff --git a/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java index e9c031e..fcced8a 100644 --- a/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java +++ b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java @@ -225,6 +225,8 @@ public class AnySilentContainer implements IAnySilentContainer { EnumGamemode gamemode = player.playerInteractManager.getGameMode(); this.forceGameMode(player, EnumGamemode.SPECTATOR); player.activeContainer.b(player); + player.activeContainer.a(player, false); + player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity()); player.activeContainer = player.defaultContainer; this.forceGameMode(player, gamemode); }