Update B/CB/S

This commit is contained in:
Shane Freeder
2017-11-17 09:40:49 +00:00
parent 5980496556
commit caec68907d
11 changed files with 85 additions and 66 deletions

View File

@@ -1,11 +1,11 @@
From 22fe86a87519c97ee5197d6badf3fef8c868e0e2 Mon Sep 17 00:00:00 2001
From 9eea87bda0275ee6c528a2bb2f174a5d8eb1b4b1 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 5ebd3c78f..7a721ffc6 100644
index 5348c0cbc..5cc5dbcd7 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1067,7 +1067,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -23,7 +23,7 @@ index 5ebd3c78f..7a721ffc6 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 7e95ec70f..d5c53032a 100644
index 357236035..dc9b17350 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 7e95ec70f..d5c53032a 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1592,6 +1596,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1591,6 +1595,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}
@@ -71,5 +71,5 @@ index 7e95ec70f..d5c53032a 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.14.1
2.15.0