SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update from upstream SpigotMC

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

27
Spigot-Server-Patches/Fix-for-ProtocolLib-compatibility.patch
View File

@@ -1,27 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Mon, 1 Sep 2014 15:33:57 -0500
Subject: [PATCH] Fix for ProtocolLib compatibility
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler {
// Spigot start - protocol patch
public void enableCompression() {
- m.pipeline().addBefore( "decoder", "decompress", new SpigotDecompressor() );
+ // PaperSpigot start - Fix ProtocolLib compatibility
+ if ( m.pipeline().get("protocol_lib_decoder") != null ) {
+ m.pipeline().addBefore( "protocol_lib_decoder", "decompress", new SpigotDecompressor() );
+ } else {
+ m.pipeline().addBefore( "decoder", "decompress", new SpigotDecompressor() );
+ }
+ // PaperSpigot end
+
m.pipeline().addBefore( "encoder", "compress", new SpigotCompressor() );
}
// Spigot end
--