Update upstream CB

This commit is contained in:
Zach Brown
2016-12-10 17:50:31 -06:00
parent b41a5ab566
commit 7c210e35b4
99 changed files with 290 additions and 321 deletions

View File

@@ -1,14 +1,14 @@
From d76ebc3e672482779cc7f5d3210cc8178b31ab74 Mon Sep 17 00:00:00 2001
From bbb98127842e91bf2359e4abe639c2e87dc079e7 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 d1c0e70..7105c42 100644
index 878a79e..687a8e6 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1010,7 +1010,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1012,7 +1012,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start
public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
@@ -72,5 +72,5 @@ index b3084b7..5be1a6f 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.10.2
2.9.3