Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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@6d63005 Fix setEggCount method from TurtleLayEggEvent (#8385)
PaperMC/Paper@abe53a7 Fix typos in isTickingWorlds API javadocs (#8382)
PaperMC/Paper@01a1387 Rewrite chunk system (#8177)
This commit is contained in:
BillyGalbreath
2022-09-26 04:35:03 -05:00
parent 3e02573ea0
commit 478d55ec4d
57 changed files with 467 additions and 2913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0019-Player-invulnerabilities.patch
View File

@@ -5,26 +5,26 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4c1c5b43b5080ff860ee511d00dc9fdd6cab8b7b..d504c6efe13681f4d62862074d49d7c2b99f5fe5 100644
index 492a7f7d2d0a06c10f11c7cd61edba26e40d9f42..2044a297f1820b41c41df9a8b3b0bbff9ae08432 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
// CraftBukkit end
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
public boolean purpurClient = false; // Purpur
+ public boolean acceptingResourcePack = false; // Purpur
public boolean isRealPlayer; // Paper
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -339,6 +340,7 @@ public class ServerPlayer extends Player {
this.bukkitPickUpLoot = true;
this.maxHealthCache = this.getMaxHealth();
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
+ this.spawnInvulnerableTime = world.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
}
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
@@ -1018,6 +1020,12 @@ public class ServerPlayer extends Player {
// Yes, this doesn't match Vanilla, but it's the best we can do for now.
@@ -1003,6 +1005,12 @@ public class ServerPlayer extends Player {
}
@@ -37,7 +37,7 @@ index 4c1c5b43b5080ff860ee511d00dc9fdd6cab8b7b..d504c6efe13681f4d62862074d49d7c2
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1025,7 +1033,7 @@ public class ServerPlayer extends Player {
@@ -1010,7 +1018,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -46,7 +46,7 @@ index 4c1c5b43b5080ff860ee511d00dc9fdd6cab8b7b..d504c6efe13681f4d62862074d49d7c2
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1199,6 +1207,7 @@ public class ServerPlayer extends Player {
@@ -1184,6 +1192,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index 4c1c5b43b5080ff860ee511d00dc9fdd6cab8b7b..d504c6efe13681f4d62862074d49d7c2
return this;
}
}
@@ -1988,6 +1997,7 @@ public class ServerPlayer extends Player {
@@ -1973,6 +1982,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index 4c1c5b43b5080ff860ee511d00dc9fdd6cab8b7b..d504c6efe13681f4d62862074d49d7c2
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2513,9 +2523,17 @@ public class ServerPlayer extends Player {
@@ -2498,9 +2508,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -108,7 +108,7 @@ index 0f0a862e3f0702a9e61bcb6b80b0375c01f46da8..3a2b67b459692a30feaec8362e44be55
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 0c05466b1265a22009781d469f8d324e3d42e0d3..dae6334ad480bc6323fa47421a22598e58e56684 100644
index 2da8186b5f34b5cce97512f50323bee091d380ab..e09cfac18f2b952bb54ec75b0450502433370819 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1014,6 +1014,8 @@ public abstract class PlayerList {
@@ -121,7 +121,7 @@ index 0c05466b1265a22009781d469f8d324e3d42e0d3..dae6334ad480bc6323fa47421a22598e
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 4225dd4e7a03fbddec6589eb8e8d4cec9deac305..7f123c203bc53582d71862c4630d63ba06779a8d 100644
index c272fc856113ca2399832b4af7f1e94af9ebb3e2..dee07e6f1d85f37f4dbb9cd0956d48f91bd39ca2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2963,5 +2963,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {