Skip to content

Port Bukkit data fix to Spigot #391

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

Merged
Jikoo merged 1 commit into from
Apr 22, 2026
Merged

Port Bukkit data fix to Spigot #391

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
23 changes: 20 additions & 3 deletions ...igot/src/main/java/com/github/jikoo/openinv/internal/spigot26_1/player/PlayerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.github.jikoo.openinv.internal.spigot26_1.player;

import com.github.jikoo.openinv.internal.spigot26_1.container.OpenInventory;
import com.github.jikoo.openinv.internal.spigot26_1.container.OpenEnderChest;
import com.github.jikoo.openinv.internal.spigot26_1.container.OpenInventory;
import com.github.jikoo.openinv.internal.spigot26_1.container.menu.OpenChestMenu;
import com.lishid.openinv.internal.ISpecialInventory;
import com.lishid.openinv.util.JulLoggerAdapter;
import com.mojang.authlib.GameProfile;
import com.mojang.logging.LogUtils;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
Expand All @@ -20,6 +21,7 @@
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.storage.TagValueInput;
import net.minecraft.world.level.storage.TagValueOutput;
import net.minecraft.world.level.storage.ValueInput;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
Expand Down Expand Up @@ -174,8 +176,23 @@ private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
return openPlayer;
}
injectPlayer(nmsPlayer);
return nmsPlayer.getBukkitEntity();

org.slf4j.Logger logger = LogUtils.getLogger();

try (ProblemReporter.ScopedCollector scopedCollector = new ProblemReporter.ScopedCollector(nmsPlayer.problemPath(), logger)) {
// Copy extra data out of existing player.
TagValueOutput output = TagValueOutput.createWithContext(scopedCollector, nmsPlayer.registryAccess());
nmsPlayer.getBukkitEntity().setExtraData(output);

injectPlayer(nmsPlayer);
CraftPlayer newPlayer = nmsPlayer.getBukkitEntity();

// Set extra data in new player.
ValueInput input = TagValueInput.create(scopedCollector, nmsPlayer.registryAccess(), output.buildResult());
newPlayer.readExtraData(input);

return newPlayer;
}
} catch (IllegalAccessException e) {
logger.log(
java.util.logging.Level.WARNING,
Expand Down