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@d5f1ffc Remove somewhat broken patch
This commit is contained in:
BillyGalbreath
2022-12-19 11:11:49 -06:00
parent e2365fa207
commit 4a580c4122
39 changed files with 181 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
patches/server/0282-Remove-Mojang-Profiler.patch
View File

@@ -538,10 +538,10 @@ index 2c23321c826d929981df51f2cc60cdcdb649a43f..0ae45cf5a084fd412305e8b2f5dabe60
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f83ab3d27 100644
index ece55efcd566bcb9b06d305496ab745807cfe975..b396a329e753f42b3878736b6b14bafda02d3744 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -656,12 +656,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -654,12 +654,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
// Paper end - optimise checkDespawn
@@ -557,7 +557,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
this.advanceWeatherCycle();
int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
long j;
@@ -688,32 +688,32 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -686,32 +686,32 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.updateSkyBrightness();
this.tickTime();
@@ -598,7 +598,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
if (flag) {
@@ -721,12 +721,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -719,12 +719,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
if (flag || this.emptyTime++ < 300) {
@@ -614,7 +614,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
}
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
@@ -737,9 +737,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -735,9 +735,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
entity.discard();
} else {
@@ -626,7 +626,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
if (true || this.chunkSource.chunkMap.getDistanceManager().inEntityTickingRange(entity.chunkPosition().toLong())) { // Paper - now always true if in the ticking list
Entity entity1 = entity.getVehicle();
@@ -751,7 +751,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -749,7 +749,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
entity.stopRiding();
}
@@ -635,7 +635,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
// Pufferfish start - copied from this.guardEntityTick
try {
this.tickNonPassenger(entity); // Pufferfish - changed
@@ -766,20 +766,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -764,20 +764,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Paper end
}
// Pufferfish end
@@ -659,7 +659,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
}
@Override
@@ -861,9 +860,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -859,9 +858,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
boolean flag = this.isRaining();
int j = chunkcoordintpair.getMinBlockX();
int k = chunkcoordintpair.getMinBlockZ();
@@ -671,7 +671,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && /*this.random.nextInt(this.spigotConfig.thunderChance) == 0 &&*/ chunk.shouldDoLightning(this.random)) { // Spigot // Paper - disable thunder // Pufferfish - replace random with shouldDoLightning
@@ -901,7 +900,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -899,7 +898,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
@@ -680,7 +680,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
int l;
if (!this.paperConfig().environment.disableIceAndSnow && (this.currentIceAndSnowTick++ & 15) == 0) { // Paper - Disable ice and snow // Paper - optimise random ticking // Pufferfish - optimize further random ticking
@@ -953,7 +952,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -951,7 +950,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
// Paper start - optimise random block ticking
@@ -689,7 +689,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
//timings.chunkTicksBlocks.startTiming(); // Paper // Purpur
if (randomTickSpeed > 0) {
LevelChunkSection[] sections = chunk.getSections();
@@ -989,7 +988,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -987,7 +986,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
// Paper end - optimise random block ticking
//timings.chunkTicksBlocks.stopTiming(); // Paper // Purpur
@@ -698,7 +698,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
}
public Optional<BlockPos> findLightningRod(BlockPos pos) {
@@ -1285,19 +1284,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1283,19 +1282,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
//try { // Purpur
// Paper end - timings
entity.setOldPosAndRot();
@@ -723,7 +723,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
//} finally { timer.stopTiming(); } // Paper - timings // Purpur
Iterator iterator = entity.getPassengers().iterator();
@@ -1326,12 +1325,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1324,12 +1323,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Paper end
passenger.setOldPosAndRot();
++passenger.tickCount;
@@ -740,7 +740,7 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
// Paper start - EAR 2
if (isActive) {
passenger.rideTick();
@@ -1343,7 +1342,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1341,7 +1340,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
vehicle.positionRider(passenger);
}
// Paper end - EAR 2
@@ -750,10 +750,10 @@ index 6169078be600a850d68c437a33fb5531f20ae4ec..9aebb5166fcd4dbb247295ff0ca8461f
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 05c442041e11d7a87359857ad9d6fed3b8132dd6..5e495c427abaae7476149c19a2131d5804aecab2 100644
index 421493a14ac3908d4ae4032e4f19922598206135..48b09b1fe0d316277a46cab700d790a1d35d3fc4 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1186,7 +1186,7 @@ public class ServerPlayer extends Player {
@@ -1184,7 +1184,7 @@ public class ServerPlayer extends Player {
PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
if (shapedetectorshape != null) {
@@ -762,7 +762,7 @@ index 05c442041e11d7a87359857ad9d6fed3b8132dd6..5e495c427abaae7476149c19a2131d58
worldserver = shapedetectorshape.world; // CraftBukkit
if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
if (resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit
@@ -1209,8 +1209,8 @@ public class ServerPlayer extends Player {
@@ -1207,8 +1207,8 @@ public class ServerPlayer extends Player {
worldserver = ((CraftWorld) exit.getWorld()).getHandle();
// CraftBukkit end
@@ -773,7 +773,7 @@ index 05c442041e11d7a87359857ad9d6fed3b8132dd6..5e495c427abaae7476149c19a2131d58
if (true) { // CraftBukkit
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
@@ -1229,7 +1229,7 @@ public class ServerPlayer extends Player {
@@ -1227,7 +1227,7 @@ public class ServerPlayer extends Player {
this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
this.connection.resetPosition();
worldserver.addDuringPortalTeleport(this);
@@ -783,19 +783,19 @@ index 05c442041e11d7a87359857ad9d6fed3b8132dd6..5e495c427abaae7476149c19a2131d58
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 fd835cd58213078df4a5a53ce710263d564644d1..1f7b2bef85cb881cf5db0ff9a4df325612134179 100644
index 92efc48a2cda63b6fac73261c12d12e58a11e5ca..816f60da1d9c4996cc6dd123400e17c4df4983d9 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -409,7 +409,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -405,7 +405,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.aboveGroundVehicleTickCount = 0;
}} // Paper - end if (valid)
}
- this.server.getProfiler().push("keepAlive");
+ //this.server.getProfiler().push("keepAlive"); // Purpur
// Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
// This should effectively place the keepalive handling back to "as it was" before 1.12.2
long currentTime = Util.getMillis();
@@ -445,7 +445,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -441,7 +441,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
// Paper end
@@ -1009,7 +1009,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 0bbf6c9879ebd286135cbf145c1eb8a95a1ef881..46a979fcafcd1492f63f7c0a8ac9a7c2a708b0a5 100644
index 2e9add3cdaf72ed2bf86e1d22a5936fb54de3936..6fb411a6c4bb1414960a80817c11205e7f1c44c5 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -822,7 +822,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1135,7 +1135,7 @@ index 0bbf6c9879ebd286135cbf145c1eb8a95a1ef881..46a979fcafcd1492f63f7c0a8ac9a7c2
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 938b224c833c0bc678cb4a6f4c856d57f6778233..57c73ae309ea38c220c3016c9eb8900c78d8aa78 100644
index 83aeda0a7a2579d894b2eec975941547b0ce67c3..147fb78f10b5eefe0da557306fecf8abb4c81539 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -398,7 +398,7 @@ public abstract class LivingEntity extends Entity {