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

Update upstream B/CB

Browse Source
This commit is contained in:
Zach Brown
2016-06-11 22:22:27 -05:00
parent 83191ef7a1
commit 14ffaf5d2c
23 changed files with 81 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0075-Complete-resource-pack-API.patch
View File

@@ -1,11 +1,11 @@
From 9b0b7c9f2eaf3432259e3124e87c3616aad9a6fb Mon Sep 17 00:00:00 2001
From e7aaa78fba39628af819e63138d45f15f9055342 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 efca444..9e75986 100644
index 120e52a..8cd02b3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1024,7 +1024,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -24,7 +24,7 @@ index efca444..9e75986 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 32d69df..4860701 100644
index 101dc2b..9299695 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -38,7 +38,7 @@ index 32d69df..4860701 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1525,6 +1529,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1540,6 +1544,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}