Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream CB

Browse Source
This commit is contained in:
Zach Brown
2017-07-24 06:47:43 -05:00
parent c9b00ce95d
commit 43543c78c4
13 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
View File

@@ -1,11 +1,11 @@
From 6760ed6dd99f5c9b6b3d710f2b5eea76714b5408 Mon Sep 17 00:00:00 2001
From 32797ba6bb12cc69a872089e579167488676c3d9 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 a8c10d3b0..cef07eb1b 100644
index cd88ae7b7..2c4f8e311 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1060,7 +1060,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -23,7 +23,7 @@ index a8c10d3b0..cef07eb1b 100644
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index eb7bdd222..ab164c11e 100644
index 7e95ec70f..d5c53032a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -81,6 +81,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -37,7 +37,7 @@ index eb7bdd222..ab164c11e 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1562,6 +1566,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1592,6 +1596,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}
@@ -71,5 +71,5 @@ index eb7bdd222..ab164c11e 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.13.0
2.13.3.windows.1