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

Update upstream CB

Browse Source
This commit is contained in:
Zach Brown
2017-07-24 06:47:43 -05:00
parent c9b00ce95d
commit 43543c78c4
13 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
View File

@@ -1,11 +1,11 @@
From 0e729e406610f5d057c235a68bb6ba79dd108b90 Mon Sep 17 00:00:00 2001
From f77708a67bce0f76232043c1b3885946578d938b 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
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index b8479d9c..e9509e61 100644
index b8479d9cf..e9509e618 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -64,6 +64,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index b8479d9c..e9509e61 100644
// CraftBukkit start
public boolean fauxSleeping;
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 0c2f7e1d..b594602a 100644
index 971267b32..1429beb59 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -614,7 +614,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -30,7 +30,7 @@ index 0c2f7e1d..b594602a 100644
double d1 = entityhuman.locY - this.locY;
double d2 = entityhuman.locZ - this.locZ;
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
index 50bca48b..57552c52 100644
index 50bca48bf..57552c522 100644
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
@@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -44,7 +44,7 @@ index 50bca48b..57552c52 100644
return false;
}
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index a599a043..1c7c187c 100644
index a599a043d..1c7c187c7 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -52,7 +52,7 @@ public final class SpawnerCreature {
@@ -57,7 +57,7 @@ index a599a043..1c7c187c 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 d6d8cd90..9e505cce 100644
index d6d8cd90e..9e505cce4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2735,7 +2735,7 @@ public abstract class World implements IBlockAccess {
@@ -70,10 +70,10 @@ index d6d8cd90..9e505cce 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 d4c8fafe..49f91a8c 100644
index d38900887..939233ef7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1488,6 +1488,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
return getHandle().locale;
@@ -91,5 +91,5 @@ index d4c8fafe..49f91a8c 100644
// Spigot start
--
2.13.1.windows.2
2.13.3.windows.1