Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@f613437 Fix CraftPlayerProfile#setId regression (#9822)
PaperMC/Paper@3e9d2ac Don't call options events on login (#9834)
PaperMC/Paper@e4d184f Replace bukkit Consumers with java consumers (#9836)
PaperMC/Paper@3e1c5e3 Add BlockData setter for FallingBlock (#9829)
PaperMC/Paper@852c1c2 Add additional tags to ItemMeta obfuscation filtering (#9665)
This commit is contained in:
granny
2023-10-14 18:33:56 -07:00
parent ad03187fab
commit ff126d3257
12 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0265-Remove-Mojang-Profiler.patch
View File

@@ -770,7 +770,7 @@ index b1f5ccd309f84f7b53d16ad6241bb4cb1bdd0726..db3c7b914a301005ba7fa92c7c042777
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index aee4dfff6e5d3c33b2c8faa4d3ee15da3ea3e4ef..12ed724a4d8824a388ef74ac90313d13fda5352c 100644
index 6a97eca066c6957eefb15e8f23eb29b1781cf1a9..41bd87096ab195c56695c5c5e46dc3c75e5a9078 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1237,7 +1237,7 @@ public class ServerPlayer extends Player {
@@ -1155,7 +1155,7 @@ index 28cac00d496cc6e37648dbe96ba4aea2b834cedd..6e0331818ef68fa355e3c27dc3e362b8
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c610016ae7d 100644
index 3380ffce121b3e4d503021c7f8a47501d3f50811..78841e0280680c720cd05ac75cbe6f70a330cad0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -411,7 +411,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1199,7 +1199,7 @@ index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c61
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3434,19 +3434,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3441,19 +3441,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1224,7 +1224,7 @@ index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c61
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3473,8 +3473,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3480,8 +3480,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1235,7 +1235,7 @@ index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c61
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3501,8 +3501,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3508,8 +3508,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1246,7 +1246,7 @@ index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c61
if (!this.level().isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3519,15 +3519,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3526,15 +3526,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}