Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-03 23:07:40 +01:00
Code Issues Projects Releases Wiki Activity

#1425: Fix bytecode transformation taking care of class-to-interface compatibility.

Browse Source 
By: Jannyboy11 <Jannyboy11@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2024-06-18 19:19:15 +10:00
parent ac95e0b210
commit e43f607e6a
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
paper-server/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
View File

@ -67,8 +67,8 @@ public class Commodore {
"org/spigotmc/event/entity/EntityDismountEvent", "org/bukkit/event/entity/EntityDismountEvent"
);
private static final Set<String> CLASS_TO_INTERFACE = Set.of(
"org/bukkit/inventory/InventoryView"
private static final Map<String, String> CLASS_TO_INTERFACE = Map.of(
"org/bukkit/inventory/InventoryView", "org/bukkit/craftbukkit/inventory/CraftAbstractInventoryView"
);
private static Map<String, RerouteMethodData> createReroutes(Class<?> clazz) {
@ -159,6 +159,10 @@ public class Commodore {
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
className = name;
isInterface = (access & Opcodes.ACC_INTERFACE) != 0;
String craftbukkitClass = CLASS_TO_INTERFACE.get(superName);
if (craftbukkitClass != null) {
superName = craftbukkitClass;
}
super.visit(version, access, name, signature, superName, interfaces);
}
@ -292,15 +296,21 @@ public class Commodore {
return;
}
if (CLASS_TO_INTERFACE.contains(owner)) {
if (opcode == Opcodes.INVOKEVIRTUAL) {
opcode = Opcodes.INVOKEINTERFACE;
}
String craftbukkitClass = CLASS_TO_INTERFACE.get(owner);
if (craftbukkitClass != null) {
if (opcode == Opcodes.INVOKESPECIAL || opcode == Opcodes.H_INVOKESPECIAL) {
owner = craftbukkitClass;
} else {
if (opcode == Opcodes.INVOKEVIRTUAL) {
opcode = Opcodes.INVOKEINTERFACE;
}
if (opcode == Opcodes.H_INVOKEVIRTUAL) {
opcode = Opcodes.H_INVOKEINTERFACE;
if (opcode == Opcodes.H_INVOKEVIRTUAL) {
opcode = Opcodes.H_INVOKEINTERFACE;
}
itf = true;
}
itf = true;
}
// SPIGOT-4496