Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4e0ed1f8 Backport fix for MC-167561 (Fixes #2886, closes#2960)
9946cef8 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-02-21 14:15:01 -06:00
parent c5ae95f138
commit a098378494
14 changed files with 66 additions and 57 deletions

View File

@@ -1,4 +1,4 @@
From baa5038436e12073e9807f59587068410bfbc2b4 Mon Sep 17 00:00:00 2001
From e2bfe7b5ee42633a1cda48893da60a6a99b5d433 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Giants naturally spawn and have AI
@@ -129,10 +129,10 @@ index ff8a41a539..d132a6105f 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index f0ef48bb15..412b521fc7 100644
index 28218f048d..00cbd99914 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -863,6 +863,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -867,6 +867,7 @@ public abstract class EntityInsentient extends EntityLiving {
return f;
}
@@ -140,7 +140,7 @@ index f0ef48bb15..412b521fc7 100644
protected void a(DifficultyDamageScaler difficultydamagescaler) {
if (this.random.nextFloat() < 0.15F * difficultydamagescaler.d()) {
int i = this.random.nextInt(2);
@@ -970,6 +971,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -974,6 +975,7 @@ public abstract class EntityInsentient extends EntityLiving {
}
}