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

Update to MC 1.12-pre2

Browse Source
This commit is contained in:
Zach Brown
2017-05-14 13:05:01 -05:00
parent 828d600143
commit 491286def4
151 changed files with 1315 additions and 1636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,15 @@
From 3cba9d06727dbd8332e08f22fa33572434be2c51 Mon Sep 17 00:00:00 2001
From 6ca60e1e0afcb2035f962b12d6079ca9a3347d28 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 ec8f581ad..43e28d61c 100644
index fc3d05394..b4507fe0c 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -63,6 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
private final ItemCooldown bV;
@@ -65,6 +65,7 @@ public abstract class EntityHuman extends EntityLiving {
private final ItemCooldown bX;
@Nullable
public EntityFishingHook hookedFish;
+ public boolean affectsSpawning = true;
@@ -17,10 +17,10 @@ index ec8f581ad..43e28d61c 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 a9e3b632b..1d26555d3 100644
index be3422adc..2802cc062 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -618,7 +618,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -614,7 +614,7 @@ public abstract class EntityInsentient extends EntityLiving {
} else {
EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
@@ -30,12 +30,12 @@ index a9e3b632b..1d26555d3 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 5af51cc0a..7531c9ba9 100644
index dcc251e31..d8344ddc9 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 {
public boolean cM() {
if (super.cM()) {
public boolean P() {
if (super.P()) {
EntityHuman entityhuman = this.world.b(this, 5.0D);
-
- return entityhuman == null;
@@ -44,7 +44,7 @@ index 5af51cc0a..7531c9ba9 100644
return false;
}
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index b23c0be2a..e42a0c776 100644
index 4c65dc0a9..c56a8e9c2 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,10 +57,10 @@ index b23c0be2a..e42a0c776 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 edd6c3b5e..751fc01d1 100644
index 1ff2263eb..b87273aca 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2722,7 +2722,7 @@ public abstract class World implements IBlockAccess {
@@ -2724,7 +2724,7 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
@@ -70,14 +70,13 @@ index edd6c3b5e..751fc01d1 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 b56ae7a36..6509df573 100644
index 433aafb33..c5924a2be 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 {
@@ -1456,6 +1456,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return new CraftAdvancementProgress(craft, data, progress);
}
+ @Override
+ public void setAffectsSpawning(boolean affects) {
+ this.getHandle().affectsSpawning = affects;
+ }
@@ -91,5 +90,5 @@ index b56ae7a36..6509df573 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.12.1.windows.1
2.13.0