minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Update viewers for closed silent inventories

Browse Source 
Closes #60
This commit is contained in:
Jikoo
2022-01-27 11:15:34 -05:00
parent 3aa31391be
commit 4fdfe15caa
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011-2021 lishid. All rights reserved. * Copyright (C) 2011-2022 lishid. All rights reserved.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -253,9 +253,13 @@ public class AnySilentContainer implements IAnySilentContainer {
GameType gameType = player.gameMode.getGameModeForPlayer(); GameType gameType = player.gameMode.getGameModeForPlayer();
this.forceGameType(player, GameType.SPECTATOR); this.forceGameType(player, GameType.SPECTATOR);
// Close container - note that this is very different from ServerPlayer#closeContainer! // ServerPlayer#closeContainer cannot be called without entering an
// Triggering event must not be re-called or we'll enter an infinite loop. // infinite loop because this method is called during inventory close.
// From ServerPlayer#closeContainer -> CraftEventFactory#handleInventoryCloseEvent
player.containerMenu.transferTo(player.inventoryMenu, player.getBukkitEntity());
// From ServerPlayer#closeContainer
player.doCloseContainer(); player.doCloseContainer();
// Regular inventory close will handle the rest - packet sending, etc.
// Revert forced game mode. // Revert forced game mode.
this.forceGameType(player, gameType); this.forceGameType(player, gameType);

10
internal/v1_18_R1/src/main/java/com/lishid/openinv/internal/v1_18_R1/AnySilentContainer.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011-2021 lishid. All rights reserved. * Copyright (C) 2011-2022 lishid. All rights reserved.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -253,9 +253,13 @@ public class AnySilentContainer implements IAnySilentContainer {
GameType gameType = player.gameMode.getGameModeForPlayer(); GameType gameType = player.gameMode.getGameModeForPlayer();
this.forceGameType(player, GameType.SPECTATOR); this.forceGameType(player, GameType.SPECTATOR);
// Close container - note that this is very different from ServerPlayer#closeContainer! // ServerPlayer#closeContainer cannot be called without entering an
// Triggering event must not be re-called or we'll enter an infinite loop. // infinite loop because this method is called during inventory close.
// From ServerPlayer#closeContainer -> CraftEventFactory#handleInventoryCloseEvent
player.containerMenu.transferTo(player.inventoryMenu, player.getBukkitEntity());
// From ServerPlayer#closeContainer
player.doCloseContainer(); player.doCloseContainer();
// Regular inventory close will handle the rest - packet sending, etc.
// Revert forced game mode. // Revert forced game mode.
this.forceGameType(player, gameType); this.forceGameType(player, gameType);