🐛 Fixed viewing issue

This commit is contained in:
SBDeveloper 2022-06-30 20:46:22 +02:00
parent bfaa99e5dd
commit a4f60fd01e
19 changed files with 71 additions and 74 deletions

View file

@ -139,7 +139,7 @@ public class MapWrapper_v1_19_R1 extends MapWrapper {
int windowId = craftPlayer.getHandle().bT.j; //inventoryMenu containerId
int stateId = craftPlayer.getHandle().bT.j(); //inventoryMenu getStateId()
ItemStack stack = new ItemStack(Material.MAP, 1);
ItemStack stack = new ItemStack(Material.FILLED_MAP, 1);
net.minecraft.world.item.ItemStack nmsStack = CraftItemStack.asNMSCopy(stack);
PacketPlayOutSetSlot packet = new PacketPlayOutSetSlot(windowId, stateId, slot, nmsStack);
@ -153,7 +153,7 @@ public class MapWrapper_v1_19_R1 extends MapWrapper {
@Override
public void showInHand(Player player, boolean force) {
if (player.getInventory().getItemInMainHand().getType() != Material.MAP && !force) return;
if (player.getInventory().getItemInMainHand().getType() != Material.FILLED_MAP && !force) return;
showInInventory(player, player.getInventory().getHeldItemSlot(), force);
}
@ -169,7 +169,7 @@ public class MapWrapper_v1_19_R1 extends MapWrapper {
@Override
public void showInFrame(Player player, ItemFrame frame, boolean force) {
if (frame.getItem().getType() != Material.MAP && !force) return;
if (frame.getItem().getType() != Material.FILLED_MAP && !force) return;
showInFrame(player, frame.getEntityId());
}
@ -182,7 +182,7 @@ public class MapWrapper_v1_19_R1 extends MapWrapper {
public void showInFrame(Player player, int entityId, String debugInfo) {
if (!isViewing(player)) return;
ItemStack stack = new ItemStack(Material.MAP, 1);
ItemStack stack = new ItemStack(Material.FILLED_MAP, 1);
if (debugInfo != null) {
ItemMeta itemMeta = stack.getItemMeta();
itemMeta.setDisplayName(debugInfo);

View file

@ -58,7 +58,7 @@ public class PacketListener_v1_19_R1 extends PacketListener {
if (id < 0) {
//It's one of our maps, invert ID and let through!
int newId = -id;
setField(packet, "a", newId); //mapId
setField(packetPlayOutMap, "a", newId); //mapId
} else {
boolean async = !plugin.getServer().isPrimaryThread();
MapCancelEvent event = new MapCancelEvent(p, id, async);