Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17: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@b327e17 Fix regenerate chunk method
PaperMC/Paper@22ac7d6 Add internal netty pipeline events
PaperMC/Paper@345a6a6 Updated Upstream (CraftBukkit)
PaperMC/Paper@86f87ba Fix custom merchant trade event world reference
This commit is contained in:
BillyGalbreath
2022-07-27 03:22:54 -05:00
parent a247b93571
commit 85f63e5df0
17 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0020-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ 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 a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe5b81f711 100644
index 14b778756bc7e0a6ad1996c23d142ccb3431ef04..92e627494e0c0c49c252f546563f115fb3beb296 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,6 +261,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
@@ -16,7 +16,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -337,6 +338,7 @@ public class ServerPlayer extends Player {
@@ -338,6 +339,7 @@ public class ServerPlayer extends Player {
this.bukkitPickUpLoot = true;
this.maxHealthCache = this.getMaxHealth();
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -24,7 +24,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
}
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
@@ -1019,6 +1021,12 @@ public class ServerPlayer extends Player {
@@ -1020,6 +1022,12 @@ public class ServerPlayer extends Player {
}
@@ -37,7 +37,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1026,7 +1034,7 @@ public class ServerPlayer extends Player {
@@ -1027,7 +1035,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -46,7 +46,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1199,6 +1207,7 @@ public class ServerPlayer extends Player {
@@ -1200,6 +1208,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
return this;
}
}
@@ -1992,6 +2001,7 @@ public class ServerPlayer extends Player {
@@ -1993,6 +2002,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2517,9 +2527,17 @@ public class ServerPlayer extends Player {
@@ -2518,9 +2528,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {