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

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@f7e3976 Revert "Legacy data should look for legacy materials (Fixes #6618)" (Fixes #6664)
PaperMC/Paper@ce1e7e8 Fix jline relocation (#6677)
PaperMC/Paper@3e8fb21 Suggest PlayerPostRespawnEvent if changing player state (#6679)
PaperMC/Paper@2b404b0 Fix nullability on Block#breakNaturally (#6651)
PaperMC/Paper@8ee9bdd Fix stacktrace deobf where thrownProxy got initialized before rewriting (#6684)
PaperMC/Paper@fce7905 Option to prevent NBT copy in smithing recipes (#6671)
PaperMC/Paper@3b2b835 Fix click event when vanilla scoreboard name coloring is enabled (#6652)
PaperMC/Paper@425edfa More CommandBlock API (#5746)
PaperMC/Paper@6847f57 Improve ItemStack#editMeta (#6502)
PaperMC/Paper@6703c13 Preserve overstacked loot (#5943)
PaperMC/Paper@0032236 Make Levels Use Correct Spawn Settings (#6419)
PaperMC/Paper@4a27a4a Update head rotation in missing places (#5481)
PaperMC/Paper@ebfd70b Use null for null resource pack prompts (#6572)
PaperMC/Paper@826acaf Fix plugin provides load order (#6687)
PaperMC/Paper@f905057 Prevent unintended light block manipulation (#6601)
PaperMC/Paper@45c4f90 Readd root/admin user detection (#6593)
PaperMC/Paper@e8830b2 Revert "Readd root/admin user detection (#6593)" (#6699)
PaperMC/Paper@cc38c16 Updated Upstream (Bukkit/CraftBukkit) (#6638)
PaperMC/Paper@7dd7c0c [ci skip] update issue template to remove checkboxes and add datapacks (#6702)
PaperMC/Paper@bde7b98 Make legacyRenderer a ViewerUnaware renderer (#6691)
PaperMC/Paper@e391591 Update paperweight to 1.1.12 (#6653)
PaperMC/Paper@e14aff9 Don't count named piglins and hoglins towards mob cap (#6452)
PaperMC/Paper@a978f41 Start console thread after PaperConfig & MinecraftServer.console are initialized (#6716)
PaperMC/Paper@b1f0cbd [ci skip] Remove redundant/broken readme badges (#6715)
PaperMC/Paper@e3ef498 [ci skip] remove markdown from issue template (#6705)
PaperMC/Paper@7ebf08a Handle missing Spawn Egg item meta for 1.17 mobs (#6700)
PaperMC/Paper@90f717f Add missing team sidebar display slots (#6690)
This commit is contained in:
Encode42
2021-10-04 14:45:08 -04:00
parent 144a08ee11
commit c783c42654
34 changed files with 220 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0066-Configurable-void-damage-height-and-damage.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d946d334af4354be0f23eee40f2723fb414bb844..c07ab3ec326bd43f857324679a4dae482b40b392 100644
index aac2d74c588e78b6873e2bbd60f855e8d0b0d043..6dea19c28b66868ba10c4e51e3fca6f2ee6a366c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -799,7 +799,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -18,10 +18,10 @@ index d946d334af4354be0f23eee40f2723fb414bb844..c07ab3ec326bd43f857324679a4dae48
&& this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) {
// Paper end
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index fce1b923f33bae53141b9cffda7808d031812a06..3626912350c6412f386578bfd5a338e120cae7fb 100644
index 2bed70446b3316b48214b3ed1b43542d699dede8..73ec77c08900f6f49ac0e1e07322bec36c7df9f0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2403,7 +2403,7 @@ public abstract class LivingEntity extends Entity {
@@ -2402,7 +2402,7 @@ public abstract class LivingEntity extends Entity {
@Override
protected void outOfWorld() {
@@ -31,7 +31,7 @@ index fce1b923f33bae53141b9cffda7808d031812a06..3626912350c6412f386578bfd5a338e1
protected void updateSwingTime() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 54f802449b8be8913c6d357ba7f6cfe50c09fb03..b1722d945ce43e296e603b8c4eec43df39cc3bed 100644
index 61e417c7c3113ce2515da09761d977a4fc766e64..c86f1d00b7ae613f2575a98ce6824c72c60c0f47 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -222,10 +222,14 @@ public class PurpurWorldConfig {