Update from upstream SpigotMC

Fix double plants having the incorrect top half SpigotMC/Spigot@377b69d787
Fix boats thinking that they were always on land for 1.8 clients SpigotMC/Spigot@4a083f819e
Correct the action used in updateGamemode. this isn't used by the ser... SpigotMC/Spigot@face904a9a
Allow the updated version of protocollib to be enabled SpigotMC/Spigot@4614a615cc
This commit is contained in:
Zach Brown
2014-09-01 18:54:34 -05:00
parent f39f423fd0
commit b7e702dacc
4 changed files with 128 additions and 56 deletions

View File

@@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
description = loader.getPluginDescription(file);
String name = description.getName();
+ // Spigot Start
+ if ( name.equalsIgnoreCase( "ProtocolLib" ) )
+ if ( name.equalsIgnoreCase( "ProtocolLib" ) && !description.getVersion().endsWith( "-HACK" ) )
+ {
+ server.getLogger().log( Level.WARNING, "Skipping loading of ProtocolLib as it does not work with Spigot 1.8 builds!" );
+ continue;