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

Work on server patches

Browse Source
This commit is contained in:
Shane Freeder
2019-12-11 00:56:03 +00:00
parent 76169471d8
commit a308619d28
42 changed files with 565 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
View File

@@ -1,15 +1,15 @@
From 66d130d40bbf356e6055727bb4cbbba1eac70025 Mon Sep 17 00:00:00 2001
From 85be01721ad128b46f13a6b97181aae6b1555119 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 9daa8ed210..5c45d8ee08 100644
index ce6e4395d..761fe32ba 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -71,6 +71,9 @@ public abstract class EntityHuman extends EntityLiving {
private final ItemCooldown bZ;
private final ItemCooldown bW;
@Nullable
public EntityFishingHook hookedFish;
+ // Paper start
@@ -19,11 +19,11 @@ index 9daa8ed210..5c45d8ee08 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 14b4c1fe69..6e304492cf 100644
index 6e84d6532..dac3540c6 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -610,7 +610,7 @@ public abstract class EntityInsentient extends EntityLiving {
if (!this.isPersistent() && !this.I()) {
@@ -619,7 +619,7 @@ public abstract class EntityInsentient extends EntityLiving {
} else if (!this.isPersistent() && !this.I()) {
EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
- if (entityhuman != null) {
@@ -32,7 +32,7 @@ index 14b4c1fe69..6e304492cf 100644
if (d0 > world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
index 323a56c63f..eb3c56fefd 100644
index 102b3a3c4..08c2a22f7 100644
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
@@ -99,7 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -45,10 +45,10 @@ index 323a56c63f..eb3c56fefd 100644
return false;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9280bb6f74..8aba3c775c 100644
index b26dff0a7..cce3b25cd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1651,7 +1651,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1635,7 +1635,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
return getHandle().locale;
@@ -69,5 +69,5 @@ index 9280bb6f74..8aba3c775c 100644
@Override
public void updateCommands() {
--
2.22.0
2.24.0