Skip to content

26.2 Map Loading Bug Fix #2843

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
MC-Samuel wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

26.2 Map Loading Bug Fix #2843

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
13 changes: 11 additions & 2 deletions v26_2/src/main/java/com/denizenscript/denizen/nms/v26_2/Handler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,17 @@ public static BlockPos toBlockPos(Location location) { // TODO: Paper renamed 'C
}

// TODO: Paper renamed some NMS methods, switch back to direct calls once on Paper NMS
public static MethodHandle reflectPaperRenamed(Class<?> clazz, String spigot, String paper, Class<?>... params) {
return ReflectionHelper.getMethodHandle(clazz, Denizen.supportsPaper ? paper : spigot, params);
public static MethodHandle reflectPaperRenamed(Class<?> clazz, String spigot, String paper) {
return reflectPaperRenamed(clazz, spigot, paper, null, null);
}

public static MethodHandle reflectPaperRenamed(Class<?> clazz, String spigot, String paper, Class<?>[] params) {
return reflectPaperRenamed(clazz, spigot, paper, params, params);
}

public static MethodHandle reflectPaperRenamed(Class<?> clazz, String spigot, String paper, Class<?>[] spigotParams, Class<?>[] paperParams) {
boolean supportsPaper = Denizen.supportsPaper;
return ReflectionHelper.getMethodHandle(clazz, supportsPaper ? paper : spigot, supportsPaper ? paperParams : spigotParams);
}

public Handler() {
Expand Down
2 changes: 1 addition & 1 deletion v26_2/src/main/java/com/denizenscript/denizen/nms/v26_2/helpers/ItemHelperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static net.minecraft.world.item.crafting.RecipeHolder<?> getNMSRecipe(Nam
return ((CraftServer) Bukkit.getServer()).getServer().getRecipeManager().byKey(nmsKey).orElse(null);
}

public static final MethodHandle CRAFT_ITEM_STACK_AS_TEMPLATE = Handler.reflectPaperRenamed(CraftItemStack.class, "asNMSTemplate", "asTemplate", ItemStack.class);
public static final MethodHandle CRAFT_ITEM_STACK_AS_TEMPLATE = Handler.reflectPaperRenamed(CraftItemStack.class, "asNMSTemplate", "asTemplate", new Class<?>[] {ItemStack.class});
Comment thread
mcmonkey4eva marked this conversation as resolved.

public static ItemStackTemplate asNMSTemplate(ItemStack item) {
try {
Expand Down
17 changes: 15 additions & 2 deletions v26_2/src/main/java/com/denizenscript/denizen/nms/v26_2/helpers/PacketHelperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.denizenscript.denizen.nms.v26_2.helpers;

import com.denizenscript.denizen.Denizen;
import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.nms.interfaces.PacketHelper;
import com.denizenscript.denizen.nms.v26_2.Handler;
Expand Down Expand Up @@ -329,15 +330,27 @@ public void setMapData(MapCanvas canvas, byte[] bytes, int x, int y, MapImage im
if (anyChanged) {
// Flag the whole image as dirty
MapItemSavedData map = (MapItemSavedData) MAPVIEW_WORLDMAP.get(canvas.getMapView());
map.setColorsDirty(Math.max(x, 0), Math.max(y, 0));
map.setColorsDirty(width + x - 1, height + y - 1);
int maxX = Math.max(x, 0);
int maxY = Math.max(y, 0);
int mapWidth = width + x - 1;
int mapHeight = height + y - 1;
if (Denizen.supportsPaper) {
MAP_ITEM_SET_COLORS.invoke(map, maxX, maxY, true);
MAP_ITEM_SET_COLORS.invoke(map, mapWidth, mapHeight, true);
}
else {
MAP_ITEM_SET_COLORS.invoke(map, maxX, maxY);
MAP_ITEM_SET_COLORS.invoke(map, mapWidth, mapHeight);
}
}
}
catch (Throwable ex) {
Debug.echoError(ex);
}
}

public static final MethodHandle MAP_ITEM_SET_COLORS = Handler.reflectPaperRenamed(MapItemSavedData.class, "setColorsDirty", "setColorsDirty", new Class<?>[] {int.class, int.class}, new Class<?>[] {int.class, int.class, boolean.class});

@Override
public void setNetworkManagerFor(Player player) {
DenizenNetworkManagerImpl.setNetworkManager(player);
Expand Down