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

Update to 1.14.2

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-27 18:40:57 -05:00
parent 61d0e22b1f
commit ccdb3affd5
9 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0018-Add-regen-effect-to-campfires.patch
View File

@@ -1,4 +1,4 @@
From c95c100ac2d6d0ca91afced8929e903d894bb2c0 Mon Sep 17 00:00:00 2001
From c623db1c5eb0b0191712f427a5906e7dd103ab0e 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
@@ -10,10 +10,10 @@ Subject: [PATCH] Add regen effect to campfires
3 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 27375059f..a64639aeb 100644
index d277281715..85d41714df 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2706,10 +2706,19 @@ public abstract class EntityLiving extends Entity {
@@ -2712,10 +2712,19 @@ public abstract class EntityLiving extends Entity {
}
public boolean hasLineOfSight(Entity entity) {
@@ -37,7 +37,7 @@ index 27375059f..a64639aeb 100644
@Override
diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
index 3a97a6571..e93ecc7b5 100644
index 2317adde44..26a5b0c021 100644
--- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
+++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
@@ -34,6 +34,27 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
@@ -65,11 +65,11 @@ index 3a97a6571..e93ecc7b5 100644
+ });
+ }
+ // Purpur end
this.f();
this.h();
} else {
for (int i = 0; i < this.items.size(); ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 30f11fe26..5e9c633ac 100644
index 30f11fe261..5e9c633ac8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -60,4 +60,25 @@ public class PurpurWorldConfig {