Update upstream B/CB/Spigot and rebuild

This commit is contained in:
Zach Brown
2016-03-27 20:48:50 -05:00
parent bf877b9a72
commit b210aa7dfe
19 changed files with 88 additions and 89 deletions

View File

@@ -1,11 +1,11 @@
From cd242a9551a73a6e3cd0d3fd844b0db333f59dd3 Mon Sep 17 00:00:00 2001
From e4208537faca7d7cfacd8f03c0e5230962f9179d Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 14:35:27 -0600
Subject: [PATCH] Add player view distance API
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 47ba1e3..35d96ff 100644
index 8d04c82..ed307bc 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -53,6 +53,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -16,7 +16,7 @@ index 47ba1e3..35d96ff 100644
// CraftBukkit start
public String displayName;
@@ -83,6 +84,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -68,6 +69,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
super(worldserver, gameprofile);
@@ -88,7 +88,7 @@ index 8ef7eb2..5421026 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 471ad38..fe5768a 100644
index 8370d94..8e94ddd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1416,6 +1416,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {