Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
86daffa2 Fix AssertionError when player hand set to empty type
This commit is contained in:
William Blake Galbreath
2019-12-09 19:28:05 -06:00
parent 8cb622fe75
commit fbc3f0d6bf
10 changed files with 133 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0014-Add-regen-effect-to-campfires.patch
View File

@@ -1,4 +1,4 @@
From 32ebf82f0284a63de5bcf419010cb4fd26cd4ba2 Mon Sep 17 00:00:00 2001
From d1441171fe52cc2c70c4b430da37f123705ca7cb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 19 May 2019 18:11:53 -0500
Subject: [PATCH] Add regen effect to campfires
@@ -11,10 +11,10 @@ Subject: [PATCH] Add regen effect to campfires
4 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 545283ed7..587fe2b36 100644
index 8f62fd48a1..7ae79f0bd4 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2719,10 +2719,19 @@ public abstract class EntityLiving extends Entity {
@@ -2720,10 +2720,19 @@ public abstract class EntityLiving extends Entity {
}
public boolean hasLineOfSight(Entity entity) {
@@ -38,7 +38,7 @@ index 545283ed7..587fe2b36 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index 998336557..2642e86f7 100644
index 9983365575..2642e86f76 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -91,6 +91,7 @@ public class EntityPotion extends EntityProjectile {
@@ -82,7 +82,7 @@ index 998336557..2642e86f7 100644
AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
List<EntityLiving> list = this.world.a(EntityLiving.class, axisalignedbb, EntityPotion.e);
diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
index 2317adde4..f112a848f 100644
index 2317adde44..f112a848f1 100644
--- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
+++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
@@ -14,6 +14,7 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
@@ -151,7 +151,7 @@ index 2317adde4..f112a848f 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 30f11fe26..314fd584b 100644
index 30f11fe261..314fd584b8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -60,4 +60,27 @@ public class PurpurWorldConfig {
@@ -183,5 +183,5 @@ index 30f11fe26..314fd584b 100644
+ }
}
--
2.20.1
2.24.0.rc1