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

No point verifying the load order for ProtocolLib.

Browse Source 
Also removed a debug message.
This commit is contained in:
Kristian S. Stangeland 2013-04-30 03:17:59 +02:00
parent 8970cd915a
commit c813811721
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ProtocolLib/src/main/java/com/comphenix/protocol/CommandPacket.java
View File

@ -348,7 +348,6 @@ class CommandPacket extends CommandBase {
else if (side.isForServer())
supported.addAll(Packets.Server.getSupported());
System.out.println("Supported for " + side + ": " + supported);
return supported;
}

15
ProtocolLib/src/main/java/com/comphenix/protocol/injector/PluginVerifier.java
View File

@ -120,12 +120,15 @@ class PluginVerifier {
if (plugin == null)
throw new IllegalArgumentException("plugin cannot be NULL.");
if (!loadedAfter.contains(plugin.getName())) {
if (verifyLoadOrder(dependency, plugin)) {
// Memorize
loadedAfter.add(plugin.getName());
} else {
return VerificationResult.NO_DEPEND;
// Skip the load order check for ProtocolLib itself
if (!dependency.equals(plugin)) {
if (!loadedAfter.contains(plugin.getName())) {
if (verifyLoadOrder(dependency, plugin)) {
// Memorize
loadedAfter.add(plugin.getName());
} else {
return VerificationResult.NO_DEPEND;
}
}
}