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

Updated Upstream (Paper & Tuinity)

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

Paper Changes:
8fe5611 Fix Player#playerListName nullability annotation (#6089)
8827886 Add back linking to Adventure Javadoc (#6088)
6ea4da4 AbstractSkeleton should extend RangedEntity (#6087)
a831634 add Optimize Light Engine patch (#5863)
56fd1a2 Update to Minecraft 1.17.1 (#6097)
f8d6cbd Deobfuscate stacktraces in sync load info (#6103)

Tuinity Changes:
5065deb Make CollisionContext initialisation lazy
388bdf5 Optimise ActivationRange#activateEntities again
2310a94 Update to 1.17.1
This commit is contained in:
William Blake Galbreath
2021-07-07 04:04:58 -05:00
parent 045bcb4ea9
commit 2040a9ac8a
73 changed files with 19485 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0213-Flying-Fall-Damage-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 747f493d6206635787271e8329e56caa89252f35..cfb12af54b9593e9b642c8d87ab349f93853f4a6 100644
index b60e38add38ac58d01f419dcb1b07a9b79bf1cb8..e2b2ee49f9b8220c2de3f26389e78b6321c60d33 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
@@ -16,7 +16,7 @@ index 747f493d6206635787271e8329e56caa89252f35..cfb12af54b9593e9b642c8d87ab349f9
// CraftBukkit start
public boolean fauxSleeping;
@@ -1723,7 +1724,7 @@ public abstract class Player extends LivingEntity {
@@ -1728,7 +1729,7 @@ public abstract class Player extends LivingEntity {
@Override
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -26,10 +26,10 @@ index 747f493d6206635787271e8329e56caa89252f35..cfb12af54b9593e9b642c8d87ab349f9
} else {
if (fallDistance >= 2.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a3b72845e6a7323f6b7e73d0494bf2c58de62c7b..26f0b436e2a9c8cf239f38e91f98fb580262b272 100644
index cd8668f9f035b1a0c2c67b18dad4411ce20bf7d7..60e882e0fad1d9153f10cdc42e3c1d43a7642bc1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2521,5 +2521,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2576,5 +2576,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}