Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +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@eda3d53 [ci skip] Improve PlayerChatEvent Deprecation Message (#9956)
PaperMC/Paper@e1cd9e5 Update paperweight to 1.5.10 and Gradle to 8.4 (#9957)
PaperMC/Paper@96d5e6c Code Generation for TypedKeys (#9233)
PaperMC/Paper@ed753d3 Re-add missing vanilla safeMode arg
PaperMC/Paper@334b2f2 Fix max nearby entities class check (#9967)
PaperMC/Paper@faa2f47 Lazily create LootContext for criterions (#9969)
PaperMC/Paper@8280211 Fix yaw being ignored for first spawn pos (#9959)
PaperMC/Paper@8eac3e1 Don't fire EntityPotionEffectEvent during worldgen (#9965)
PaperMC/Paper@0b20f94 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9953)
PaperMC/Paper@f9938d3 Fix plugin bootstrap dependency tree population (#9963)
PaperMC/Paper@b37bbcf Use ? super in Consumer/Predicate API (#9939)
This commit is contained in:
granny
2023-11-26 22:27:27 -08:00
parent 4b1a082c94
commit c46cb7ef66
35 changed files with 122 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0267-Remove-Mojang-Profiler.patch
View File

@@ -566,7 +566,7 @@ index 03bde9d1c765700c872cc592fe414eb815956e47..43a46feb5fb4bf23d71bc4f6c08caa93
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index d5837c675e033c7277656e026cb98d55b6668038..c3239a2823d152b8de1f760216323936c8b3a1ff 100644
index ac28e6fecabe74fc0207ad4832ef166d5fc0b59b..1c8724fb56e790922c7e8fc73bc97442b7a6df83 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -823,12 +823,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -778,7 +778,7 @@ index d5837c675e033c7277656e026cb98d55b6668038..c3239a2823d152b8de1f760216323936
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 a5ad9a5bf708f6ed9844c5ac42f07a34f0833e30..38eed0f72cb6247418944fdd0770e4f9bda38f9e 100644
index 1a864d733d8a9a098edacc048fc20a65c18f7684..199edc0bdb370e83541167bfb1dd219ed42ad829 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 {
@@ -1037,7 +1037,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index af06a919673f2e4f41d1cd712caa5b002d12ae71..5d46d35db653d58ccb850794282e8613b33e2393 100644
index f9998e1d3adff725842cff41b2950492e6936971..4254946d3f993478e44a8dda18d8a4e612ca8dad 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -842,7 +842,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1163,7 +1163,7 @@ index af06a919673f2e4f41d1cd712caa5b002d12ae71..5d46d35db653d58ccb850794282e8613
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index b7d5c1342bf400bf0ee2a339b546bfed21189b56..a43859eeacf6743519f0076d005885c7c5331b1a 100644
index c8dc1d1f67474a06f82385d6ab7d893e3cb115ef..c7815bc795ff11d521f4fa1417fe475787e65c3c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -410,7 +410,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1184,7 +1184,7 @@ index b7d5c1342bf400bf0ee2a339b546bfed21189b56..a43859eeacf6743519f0076d005885c7
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3159,10 +3159,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3167,10 +3167,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1198,7 +1198,7 @@ index b7d5c1342bf400bf0ee2a339b546bfed21189b56..a43859eeacf6743519f0076d005885c7
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3174,7 +3174,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3182,7 +3182,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1207,7 +1207,7 @@ index b7d5c1342bf400bf0ee2a339b546bfed21189b56..a43859eeacf6743519f0076d005885c7
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3464,19 +3464,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3472,19 +3472,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1232,7 +1232,7 @@ index b7d5c1342bf400bf0ee2a339b546bfed21189b56..a43859eeacf6743519f0076d005885c7
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3503,8 +3503,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3511,8 +3511,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1243,7 +1243,7 @@ index b7d5c1342bf400bf0ee2a339b546bfed21189b56..a43859eeacf6743519f0076d005885c7
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3531,8 +3531,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3539,8 +3539,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1254,7 +1254,7 @@ index b7d5c1342bf400bf0ee2a339b546bfed21189b56..a43859eeacf6743519f0076d005885c7
if (!this.level().isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3549,15 +3549,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3557,15 +3557,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}
@@ -1509,7 +1509,7 @@ index 89e473aadb1ab0bd802e7f74a77cce09578320d7..7369290820f726c28c87bc63dba2a74f
Optional<Integer> optional = this.getBrain().getMemory(MemoryModuleType.PLAY_DEAD_TICKS);
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index f44261137f12354640170206ca7bfb6d991dc7a0..1d84135c709a90843b1ee34fb47508e78a7ce95d 100644
index bfdd33beb8206c8b0c96aad5b5002c8db02ae912..cd9129bb5049c13f08c58b8581d511b59a5bb1b5 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -158,13 +158,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl