Update upstream CB

This commit is contained in:
Zach Brown
2016-10-23 01:32:04 -05:00
parent 557c26bec4
commit 88e1379b38
11 changed files with 31 additions and 83 deletions

View File

@@ -1,14 +1,14 @@
From dab73f3d08c224355e576cb9f682661206ad3999 Mon Sep 17 00:00:00 2001
From 7ad7edb70e7183fe0cf057c6ac2483f8a1d3e5fa Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index de4df07..5e58fe8 100644
index b2339e9..5e9eca1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1035,7 +1035,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1033,7 +1033,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start
public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {