Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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@84b5d4a Reorder bukkit damage source entity for explosion (#8553)
PaperMC/Paper@b4c1ae6 Fix MC-121048 (#8429)
PaperMC/Paper@825cb43 [ci skip] Add .fleet/ folder to .gitignore (#8574)
PaperMC/Paper@669fed4 Fix MC-179072 (#8421)
PaperMC/Paper@8f498dc Sync chunk load command improvements (#8554)
PaperMC/Paper@3299886 [ci skip] Add TheFruxz to the license MIT list (#8575)
PaperMC/Paper@0a6f100 Add more collision code skipping logic (#7581)
PaperMC/Paper@76503f8 Strip coordinates from lodestone compasses (#8561)
PaperMC/Paper@b95d4b2 Moving ATs from the at file to individual patches (#8573)
PaperMC/Paper@4a3ae59 [ci skip] Add check for git repo (#8578)
PaperMC/Paper@a7df847 Add Player Warden Warning API (#8470)
PaperMC/Paper@3ab194e Avoid a cubed max search distance for POIs (#8576)
This commit is contained in:
Ben Kerllenevich
2022-11-21 23:26:26 -05:00
parent 79accf69dc
commit 8da783d679
23 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/server/0288-Remove-Mojang-Profiler.patch
View File

@@ -371,7 +371,7 @@ index 30093cd8bd35f0bbc8f26eca370622ee12a046b6..2986f110348b376bcdc64fa39b688855
++j;
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 6d819e330f55ddf7e2ccf2f615543f4c9eca1f71..2182ee049defee88067aa61cee42d3a0122061b7 100644
index fac291c9a48b2563d33fe7250e57556aa29ec669..ceaa44e8fbf02aef36f5ae663269dfc1026e4086 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -606,20 +606,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -400,7 +400,7 @@ index 6d819e330f55ddf7e2ccf2f615543f4c9eca1f71..2182ee049defee88067aa61cee42d3a0
public boolean hasWork() {
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 2af21158dfb44a49f15c07d765a09335f76ed3dd..9d13ef8c597b9ca11280ad1d3249d13bbab4ac6f 100644
index 6a11e522c5bd9042dcf89e2538d354448e501fbe..3bee0bfc481ffe3ea1860c5b23ad2efbe81cb0ba 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -430,16 +430,16 @@ public class ServerChunkCache extends ChunkSource {
@@ -538,7 +538,7 @@ index 2af21158dfb44a49f15c07d765a09335f76ed3dd..9d13ef8c597b9ca11280ad1d3249d13b
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 550c3566b14aace0dbd4e77876abc2bb663bcf5c..c888e654ab9449bfdc7dfe16078eb0786ae6c15e 100644
index a242d1d51784c5e22464c3c23cd45b62e338f5fd..55dfc1e2d7653a474aefed403dc67016aaa77514 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -653,12 +653,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -754,7 +754,7 @@ index 550c3566b14aace0dbd4e77876abc2bb663bcf5c..c888e654ab9449bfdc7dfe16078eb078
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 8c83b0fc6d6db5e145ec4c1bcd035e8b06aa37bf..f3ea3860bda768a8bed4175fd993b708f3ab5de4 100644
index f6032bc75aaad33e183804a7dea5423720e2ae55..d4bebb739d8ff19a610be6775ee25ede4bce2a8c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1157,7 +1157,7 @@ public class ServerPlayer extends Player {
@@ -787,7 +787,7 @@ index 8c83b0fc6d6db5e145ec4c1bcd035e8b06aa37bf..f3ea3860bda768a8bed4175fd993b708
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 3503b7defe826db564370dbab78a8c91f5156d20..d74ee9e75eaf3b012c61b93e2b6f6a36a592688a 100644
index 66c89b3c3668cfc0d427bca85918dbd7fc7089af..7bdc02e997b67c4b579f226ed5ea7f1465dd8546 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -416,7 +416,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1013,7 +1013,7 @@ index 5725c6593480fada65facc29664a00a8cc073512..ccb1f998ae3122d1856d77149ff7e7df
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6019072c354220fb07e14e746d925956e1ed37f0..d266d35e3c975a843c3f4f6d6857249280dd2811 100644
index ef8d7c0c922cdc9e4ee857144677990c90c663ba..6c8a5126c45aec13dc881a1998bdbb0f11bb9688 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -821,7 +821,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1139,7 +1139,7 @@ index 6019072c354220fb07e14e746d925956e1ed37f0..d266d35e3c975a843c3f4f6d68572492
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996dc9cd35a 100644
index cd70cf663f0fb2ddcbd637e8260dc994f3be258b..d0c8c39ff78637de14bfdfef78d74f4035bfb6a4 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -396,7 +396,7 @@ public abstract class LivingEntity extends Entity {
@@ -1160,7 +1160,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3088,10 +3088,10 @@ public abstract class LivingEntity extends Entity {
@@ -3090,10 +3090,10 @@ public abstract class LivingEntity extends Entity {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1174,7 +1174,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3103,7 +3103,7 @@ public abstract class LivingEntity extends Entity {
@@ -3105,7 +3105,7 @@ public abstract class LivingEntity extends Entity {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1183,7 +1183,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3385,19 +3385,19 @@ public abstract class LivingEntity extends Entity {
@@ -3398,19 +3398,19 @@ public abstract class LivingEntity extends Entity {
}
this.setDeltaMovement(d4, d5, d6);
@@ -1208,7 +1208,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
if (this.jumping && this.isAffectedByFluids()) {
double d7;
@@ -3424,8 +3424,8 @@ public abstract class LivingEntity extends Entity {
@@ -3437,8 +3437,8 @@ public abstract class LivingEntity extends Entity {
this.noJumpDelay = 0;
}
@@ -1219,7 +1219,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3434,8 +3434,8 @@ public abstract class LivingEntity extends Entity {
@@ -3447,8 +3447,8 @@ public abstract class LivingEntity extends Entity {
// SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper
this.travel(new Vec3((double) this.xxa, (double) this.yya, (double) this.zza));
// SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper
@@ -1230,7 +1230,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
int i;
@@ -3455,15 +3455,15 @@ public abstract class LivingEntity extends Entity {
@@ -3468,15 +3468,15 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.FREEZE, (float) i);
}
@@ -1250,7 +1250,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
// Purpur start
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index d0c52f9cd2001aa14c04684c24ef32f07e55c905..d5e3bd662da349fc2ee58c7800d79c60300f33b3 100644
index 8c534ea4b461550c14c6d5ee131e5650784c2e0f..bc18c166ca776b0ef6e816eb034e410c391258b6 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -332,14 +332,14 @@ public abstract class Mob extends LivingEntity {
@@ -1356,7 +1356,7 @@ index d0c52f9cd2001aa14c04684c24ef32f07e55c905..d5e3bd662da349fc2ee58c7800d79c60
}
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
index 0cc0d719e95e108263683b7a40f4ce3a8ca9465b..872ec431ae6beb0ef603d833f38aedb9d87e5466 100644
index bc3defa2c2ca0971ce3d9642a38380973a82de46..cbe957013d958d10ed6707a3785893f6856b9c3f 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
@@ -102,8 +102,8 @@ public class GoalSelector {
@@ -1660,10 +1660,10 @@ index 20668d53625ec88ba3eb2a655ad3f6bc4fb0fd0e..b1a4b83fc248ae2f0a8852e60f9cd448
this.assignProfessionWhenSpawned = false;
}
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index 01477e7240f9e33d08d416a7d40ee10f3e5d4abf..c9def2202d7c2a523858ec124df2beaf994d9888 100644
index 31708d1e94b557896d42199aa0bc6ed26a4c6d8a..e9245a476936590f165a1e5c42515218d7572906 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -363,7 +363,7 @@ public class Explosion {
@@ -366,7 +366,7 @@ public class Explosion {
if (!iblockdata.isAir() && iblockdata.isDestroyable()) { // Paper
BlockPos blockposition1 = blockposition.immutable();
@@ -1672,7 +1672,7 @@ index 01477e7240f9e33d08d416a7d40ee10f3e5d4abf..c9def2202d7c2a523858ec124df2beaf
if (block.dropFromExplosion(this)) {
Level world = this.level;
@@ -385,7 +385,7 @@ public class Explosion {
@@ -388,7 +388,7 @@ public class Explosion {
this.level.setBlock(blockposition, Blocks.AIR.defaultBlockState(), 3);
block.wasExploded(this.level, blockposition, this);
@@ -1746,7 +1746,7 @@ index 5e3acd365d9aca4271a590564e3eaad0d268bf11..0bb14272d024af90e7aef40f2f694e18
}
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 724f034d92f9f3f1021802e2bc2a845146c45efa..e882996b64178d2e22aeaf6f6a16a05eb715362d 100644
index 2d19db940d4f1624631cec29547e88842a4cfb98..5b5c18f70a989da6bff77485692a4ceef9a6f08d 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -131,7 +131,7 @@ public final class NaturalSpawner {
@@ -1768,7 +1768,7 @@ index 724f034d92f9f3f1021802e2bc2a845146c45efa..e882996b64178d2e22aeaf6f6a16a05e
// Paper start
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 434e33aa5c1c9722ea065627f1559c833954a342..7bae0525cc48d531de5a949f038417e098a59443 100644
index 772a2dc21071a3f687b51fbddf9f12a90d41ce79..2877441927de3aeba28f5c3dd876e2ae4c15797c 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -1309,9 +1309,9 @@ public class LevelChunk extends ChunkAccess {