Update upstream B/CB

This commit is contained in:
Zach Brown
2016-06-11 22:22:27 -05:00
parent 83191ef7a1
commit 14ffaf5d2c
23 changed files with 81 additions and 110 deletions

View File

@@ -1,4 +1,4 @@
From b10b62e4704a0f5fc2c4500c6a7de5fcafe7b683 Mon Sep 17 00:00:00 2001
From ba8fc1510d97add8edc358ee242c8227ac70afd7 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API
@@ -184,10 +184,10 @@ index c110c74..da6b78b 100644
double d4 = entityhuman.e(d0, d1, d2);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ce85bc2..eb6d41b 100644
index 6b3bbfe..11e3028 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1408,6 +1408,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1423,6 +1423,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}