Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-12-29 12:37:35 +01:00
Code Issues Projects Releases Wiki Activity

Ensure that we don't return enhancer classes as vanilla classes.

Browse Source
This commit is contained in:
Kristian S. Stangeland 2012-12-04 14:59:08 +01:00
parent 733ecdd59b
commit 86d3461700
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ProtocolLib/src/main/java/com/comphenix/protocol/injector/MinecraftRegistry.java
View File

@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import net.minecraft.server.Packet; import net.minecraft.server.Packet;
import net.sf.cglib.proxy.Factory;
import com.comphenix.protocol.reflect.FieldAccessException; import com.comphenix.protocol.reflect.FieldAccessException;
import com.comphenix.protocol.reflect.FieldUtils; import com.comphenix.protocol.reflect.FieldUtils;
@ -166,7 +167,7 @@ class MinecraftRegistry {
// Optimized lookup // Optimized lookup
if (lookup.containsKey(packetID)) { if (lookup.containsKey(packetID)) {
return lookup.get(packetID); return removeEnhancer(lookup.get(packetID), forceVanilla);
} }
// Will most likely not be used // Will most likely not be used
@ -174,10 +175,27 @@ class MinecraftRegistry {
if (Objects.equal(entry.getValue(), packetID)) { if (Objects.equal(entry.getValue(), packetID)) {
// Attempt to get the vanilla class here too // Attempt to get the vanilla class here too
if (!forceVanilla || entry.getKey().getName().startsWith("net.minecraft.server")) if (!forceVanilla || entry.getKey().getName().startsWith("net.minecraft.server"))
return entry.getKey(); return removeEnhancer(entry.getKey(), forceVanilla);
} }
} }
throw new IllegalArgumentException("The packet ID " + packetID + " is not registered."); throw new IllegalArgumentException("The packet ID " + packetID + " is not registered.");
} }
/**
* Find the first superclass that is not a CBLib proxy object.
* @param clazz - the class whose hierachy we're going to search through.
* @param remove - whether or not to skip enhanced (proxy) classes.
* @return If remove is TRUE, the first superclass that is not a proxy.
*/
private static Class removeEnhancer(Class clazz, boolean remove) {
if (remove) {
// Get the underlying vanilla class
while (Factory.class.isAssignableFrom(clazz) && !clazz.equals(Object.class)) {
clazz = clazz.getSuperclass();
}
}
return clazz;
}
} }

3
ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedArrayList.java
View File

@ -27,6 +27,7 @@ import com.comphenix.protocol.injector.player.NetworkFieldInjector.FakePacket;
import net.minecraft.server.Packet; import net.minecraft.server.Packet;
import net.sf.cglib.proxy.Enhancer; import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.Factory;
import net.sf.cglib.proxy.MethodInterceptor; import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy; import net.sf.cglib.proxy.MethodProxy;
@ -95,7 +96,7 @@ class InjectedArrayList extends ArrayList<Packet> {
int packetID = invoker.getPacketID(source); int packetID = invoker.getPacketID(source);
Class<?> type = invoker.getPacketClassFromID(packetID, true); Class<?> type = invoker.getPacketClassFromID(packetID, true);
// We want to subtract the byte amount that were added to the running // We want to subtract the byte amount that were added to the running
// total of outstanding packets. Otherwise, cancelling too many packets // total of outstanding packets. Otherwise, cancelling too many packets
// might cause a "disconnect.overflow" error. // might cause a "disconnect.overflow" error.