9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-04 15:31:43 +00:00

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@b0d36cae Updated Upstream (Paper)
PurpurMC/Purpur@97dcff40 set DamageCause to `SUICIDE` for scissor's DamageSource
PurpurMC/Purpur@a9862d7e Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2025-02-19 01:59:30 +03:00
parent 2daf7bd122
commit c012174ba7
11 changed files with 21 additions and 21 deletions

View File

@@ -8,7 +8,7 @@
public boolean onGround;
public boolean horizontalCollision;
public boolean verticalCollision;
@@ -1116,6 +_,12 @@
@@ -1117,6 +_,12 @@
// Paper end - detailed watchdog information
public void move(MoverType type, Vec3 movement) {
@@ -21,7 +21,7 @@
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
// Paper start - detailed watchdog information
ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
@@ -2157,30 +_,42 @@
@@ -2158,30 +_,42 @@
return new Vec3(this.xOld, this.yOld, this.zOld);
}
@@ -78,7 +78,7 @@
public void playerTouch(Player player) {
}
@@ -4247,6 +_,7 @@
@@ -4248,6 +_,7 @@
}
public final void setBoundingBox(AABB bb) {

View File

@@ -32,7 +32,7 @@
}
public float getSpeed() {
@@ -3617,6 +_,7 @@
@@ -3635,6 +_,7 @@
protected void updateFallFlying() {
this.checkSlowFallDistance();
if (!this.level().isClientSide) {

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
@@ -1877,6 +_,11 @@
@@ -1879,6 +_,11 @@
}
public void causeFoodExhaustion(float exhaustion, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason reason) {