495c399ff4
Add support for Minecraft 1.8.x SpigotMC/Spigot@b15ae91145 Skip loading of ProtocolLib SpigotMC/Spigot@508ec8f573 Apply the block fix to block change packets SpigotMC/Spigot@b9349e416d Blacklist Orebfuscator as well. SpigotMC/Spigot@b2ba105762
33 lines
1.7 KiB
Diff
33 lines
1.7 KiB
Diff
From 55d719bb45bb3b91b3b540142c568504b3e7f4c9 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <git@md-5.net>
|
|
Date: Mon, 1 Sep 2014 19:36:20 +1000
|
|
Subject: [PATCH] Skip loading of ProtocolLib and Orebfuscator.
|
|
|
|
As it does not work with Spigot 1.8 builds!
|
|
|
|
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
index 1d51908..c7ad532 100644
|
|
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
@@ -132,6 +132,18 @@ public final class SimplePluginManager implements PluginManager {
|
|
try {
|
|
description = loader.getPluginDescription(file);
|
|
String name = description.getName();
|
|
+ // Spigot Start
|
|
+ if ( name.equalsIgnoreCase( "ProtocolLib" ) )
|
|
+ {
|
|
+ server.getLogger().log( Level.WARNING, "Skipping loading of ProtocolLib as it does not work with Spigot 1.8 builds!" );
|
|
+ continue;
|
|
+ }
|
|
+ if ( name.equalsIgnoreCase( "Orebfuscator" ) )
|
|
+ {
|
|
+ server.getLogger().log( Level.WARNING, "Skipping loading of Orebfuscator as it does not work with Spigot 1.8 builds!" );
|
|
+ continue;
|
|
+ }
|
|
+ // Spigot End
|
|
if (name.equalsIgnoreCase("bukkit") || name.equalsIgnoreCase("minecraft") || name.equalsIgnoreCase("mojang")) {
|
|
server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "': Restricted Name");
|
|
continue;
|
|
--
|
|
1.9.1
|
|
|