Skip to content

Fix double chests double-counting their viewers #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KostiaFed wants to merge 1 commit into
base: ver/26.1
Choose a base branch
from
Open

Fix double chests double-counting their viewers #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/java/org/cardboardpowered/mixin/server/level/ServerPlayerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.level.ServerPlayer.RespawnConfig;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.world.CompoundContainer;
import net.minecraft.world.Container;
import net.minecraft.world.MenuProvider;
import net.minecraft.world.entity.HumanoidArm;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.ChestMenu;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.portal.TeleportTransition;
import net.minecraft.world.phys.Vec3;
Expand Down Expand Up @@ -339,13 +339,15 @@ public void openHandledScreen_c(MenuProvider factory, CallbackInfoReturnable<Opt
((AbstractContainerMenuBridge)container).setTitle(factory.getDisplayName());

boolean cancelled = false;
final AbstractContainerMenu created = container;
final com.mojang.datafixers.util.Pair<net.kyori.adventure.text.Component, AbstractContainerMenu> result = org.bukkit.craftbukkit.event.CraftEventFactory.callInventoryOpenEventWithTitle(((ServerPlayer)(Object)this), container, cancelled);
container = result.getSecond();
if (container == null && !cancelled) {
if (factory instanceof Container) {
((Container) factory).stopOpen((ServerPlayer)(Object)this);
} else if (factory instanceof CompoundContainer)
((CompoundContainer) factory).container1.stopOpen((ServerPlayer)(Object)this);
} else if (created instanceof ChestMenu) {
((ChestMenu) created).getContainer().stopOpen((ServerPlayer)(Object)this);
}

ci.setReturnValue(OptionalInt.empty());
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/cardboardpowered/mixin/world/CompoundContainerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ public ItemStack getItem(int i) {

@Override
public void onOpen(CraftHumanEntity who) {
this.container1.startOpen(who.getHandle());
this.container2.startOpen(who.getHandle());
((ContainerBridge) this.container1).onOpen(who);
((ContainerBridge) this.container2).onOpen(who);
transaction.add(who);
}

@Override
public void onClose(CraftHumanEntity who) {
this.container1.stopOpen(who.getHandle());
this.container2.stopOpen(who.getHandle());
((ContainerBridge) this.container1).onClose(who);
((ContainerBridge) this.container2).onClose(who);
transaction.remove(who);
}

Expand Down
Loading