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

Update upstream tacos B/CB/S

Browse Source
This commit is contained in:
Zach Brown
2016-07-04 18:49:14 -05:00
parent 97d0490c4a
commit 2e2f401132
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From a583c941f42db8331d0edfd157c9d568300e1a0a Mon Sep 17 00:00:00 2001
From 23fc12506a96c04c5b860836943e912fbf12192c 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 9abe333..cb1169c 100644
index 7d67e67..d5e06f0 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1027,7 +1027,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -24,7 +24,7 @@ index 9abe333..cb1169c 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 101dc2b..9299695 100644
index 0c0906a..e372761 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 101dc2b..9299695 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1540,6 +1544,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1544,6 +1548,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}
@@ -72,5 +72,5 @@ index 101dc2b..9299695 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.9.0
2.9.0.windows.1