Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
33a615de Add option to nerf pigmen from nether portals (#2937)
125a517d Update upstream CB
This commit is contained in:
William Blake Galbreath
2020-02-18 20:13:10 -06:00
parent 9e073631de
commit c98e91e6e3
9 changed files with 38 additions and 38 deletions

View File

@@ -1,4 +1,4 @@
From 50380a3f922e7c37c0840a1ee205c5b76cea0fd7 Mon Sep 17 00:00:00 2001
From 6c10cda1f0c2485eaa03e7695c99980f8f92dd3b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -17,10 +17,10 @@ Subject: [PATCH] Implement AFK API
10 files changed, 112 insertions(+), 24 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index dbd7236d8..a2fe1a424 100644
index 2bbdb994a..3e5dd4362 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1373,6 +1373,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1375,6 +1375,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return MathHelper.c(f * f + f1 * f1 + f2 * f2);
}