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

update upstream

Browse Source
This commit is contained in:
Aikar
2018-07-29 12:42:07 -04:00
parent 6d166798e6
commit 566740114e
79 changed files with 450 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
View File

@@ -1,4 +1,4 @@
From 655295872243600487c4870e833198a8746aecf1 Mon Sep 17 00:00:00 2001
From 7dab34327d9a40e31034b6360562dbb6a85376f4 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
@@ -58,7 +58,7 @@ index e54dcaa99..b12e767db 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 6ca7a2069..ae11c2e43 100644
index 38d169cc1..d0516b088 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -28,6 +28,7 @@ import org.bukkit.craftbukkit.block.data.CraftBlockData;
@@ -69,7 +69,7 @@ index 6ca7a2069..ae11c2e43 100644
import org.bukkit.event.block.BlockCanBuildEvent;
import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -2411,7 +2412,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -2422,7 +2423,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
@@ -79,10 +79,10 @@ index 6ca7a2069..ae11c2e43 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 47f650e42..0109d8e97 100644
index 3dc76f7dd..fa35a75f3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1585,7 +1585,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1628,7 +1628,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
return getHandle().locale;