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

8
Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
View File

@@ -1,4 +1,4 @@
From 2541e7a0b8cc0b9af75632151f1b327f6288e18e Mon Sep 17 00:00:00 2001
From 3f3590bd24fd8de0aea64160d530aa3e8676089d 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
@@ -57,7 +57,7 @@ index 17bf3e4..a05fad5 100644
j = MathHelper.floor(entityhuman.locZ / 16.0D);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b9b13c7..688f405 100644
index 8265e3e..dd5fe02 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2719,7 +2719,7 @@ public abstract class World implements IBlockAccess {
@@ -70,10 +70,10 @@ index b9b13c7..688f405 100644
if (d3 < 0.0D || d4 < d3 * d3) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 877a0c8..5e9834c 100644
index 08f3b08..b6cfd0d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1457,6 +1457,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1468,6 +1468,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}