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

Update to 1.14.3

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-25 21:12:19 -05:00
parent 5d6c6b7efa
commit 4bc7fbcdfa
23 changed files with 444 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 74feb86c1e53deca4d2904bc49702263b5095f2d Mon Sep 17 00:00:00 2001
From b6f682d729fd517aadd3e13ff1cd103df00aaa9a 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, 89 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 38a0e4978..b1372c71d 100644
index 694200deb2..1704609a7d 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2713,10 +2713,19 @@ public abstract class EntityLiving extends Entity {
@@ -2715,10 +2715,19 @@ public abstract class EntityLiving extends Entity {
}
public boolean hasLineOfSight(Entity entity) {
@@ -38,7 +38,7 @@ index 38a0e4978..b1372c71d 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index 47fc8b031..dff7568d2 100644
index acf6082e7f..b0732da909 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 47fc8b031..dff7568d2 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..7360e462d 100644
index 2317adde44..7360e462d9 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..7360e462d 100644
}
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 {