Update B/CB/S

This commit is contained in:
Shane Freeder
2017-12-05 01:34:10 +00:00
parent 70caa048a8
commit a693cb21ab
28 changed files with 128 additions and 128 deletions

View File

@@ -1,4 +1,4 @@
From 9eea87bda0275ee6c528a2bb2f174a5d8eb1b4b1 Mon Sep 17 00:00:00 2001
From 38beacf452129cb95545832bc38121498c02b9ee 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
@@ -23,10 +23,10 @@ index 5348c0cbc..5cc5dbcd7 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 357236035..dc9b17350 100644
index aa5165f65..219daa59b 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 {
@@ -88,6 +88,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private double health = 20;
private boolean scaledHealth = false;
private double healthScale = 20;
@@ -37,7 +37,7 @@ index 357236035..dc9b17350 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1591,6 +1595,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1646,6 +1650,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}