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

Update upstream B/CB/S

Browse Source
This commit is contained in:
Zach Brown
2017-02-17 20:03:38 -06:00
parent f654bf8fc2
commit ae98591b8c
25 changed files with 165 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From b3c68d4badf919471ce40ff937ec2d383419c167 Mon Sep 17 00:00:00 2001
From f723b9fa6313d76c8e15f7d597be8e3c0bcac1ae 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 4d8c88a..b42c0be 100644
index 2fb1a3d..87e0707 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1019,7 +1019,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -24,10 +24,10 @@ index 4d8c88a..b42c0be 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 44d2698..7a6609f 100644
index a1e46ef..15da24d 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 {
@@ -74,6 +74,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private double health = 20;
private boolean scaledHealth = false;
private double healthScale = 20;
@@ -38,7 +38,7 @@ index 44d2698..7a6609f 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1559,6 +1563,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1570,6 +1574,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}