Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +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:
0f06d380 Restrict vanilla teleport command to within worldborder
24d93aaf Fix Optional null issue - Fixes #3155
eb71c5fa Fix incorect timing of mspt
1ca80434 Optimise entity hard collision checking
b67a4237 Don't run entity collision code if not needed
bd9aa547 Optimise ArraySetSorted#removeIf
78871d07 Make JavaClassLoader thread-safe (Fixes #3137) (#3144)
This commit is contained in:
ChrystiGalbreath
2020-04-16 20:45:31 -05:00
parent ea1b4e3583
commit 6c4aab0053
21 changed files with 270 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0034-Campfires-have-regen-effect.patch
View File

@@ -1,4 +1,4 @@
From af5c19a1d071f70a805d733799353485d3a679ef Mon Sep 17 00:00:00 2001
From a8a28fa403a52296f962ecd52aed54289ec3c6a9 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] Campfires have regen effect
@@ -12,7 +12,7 @@ Subject: [PATCH] Campfires have regen effect
5 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index 6303be944c..65f8d803b8 100644
index 6303be944..65f8d803b 100644
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
@@ -8,7 +8,7 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -25,10 +25,10 @@ index 6303be944c..65f8d803b8 100644
public static final BlockStateDirection e = BlockProperties.N;
private static final VoxelShape f = Block.a(6.0D, 0.0D, 6.0D, 10.0D, 16.0D, 10.0D);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 47b19b7754..106fb5c027 100644
index 01c0919f6..fdc32d986 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2772,10 +2772,19 @@ public abstract class EntityLiving extends Entity {
@@ -2778,10 +2778,19 @@ public abstract class EntityLiving extends Entity {
}
public boolean hasLineOfSight(Entity entity) {
@@ -52,7 +52,7 @@ index 47b19b7754..106fb5c027 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index 2f9a73ea33..2398499bcb 100644
index 2f9a73ea3..2398499bc 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 {
@@ -96,7 +96,7 @@ index 2f9a73ea33..2398499bcb 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 a1580b8c6d..618ca2d763 100644
index a1580b8c6..618ca2d76 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
@@ -165,7 +165,7 @@ index a1580b8c6d..618ca2d763 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3c7f545e2e..3aa2da98b8 100644
index 3c7f545e2..3aa2da98b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -71,6 +71,29 @@ public class PurpurWorldConfig {
@@ -199,5 +199,5 @@ index 3c7f545e2e..3aa2da98b8 100644
private void farmlandSettings() {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
--
2.24.0
2.25.0.windows.1