Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +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@a9f252e Replace third party repos with Paper repo (#7733)
PaperMC/Paper@b8fa41e [ci skip] Remove Mojang repo from test-plugin
PaperMC/Paper@c6e631a Use username instead of display name in PlayerList#getPlayerStats (#7740)
PaperMC/Paper@1cfd363 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
granny
2022-04-16 05:03:34 -07:00
parent daeb232e18
commit d4c11601c7
45 changed files with 186 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0018-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 89189f12f467b6b97569553d3af47b14068a6a23..3697b25a60811e4b73d281b49e47d61c41428d81 100644
index 38c2e2b4e6577dd6db84b86147a6f0c5bd0b8879..c03f9ed7dfb53041d37de950b2ec734bde614d0e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -253,6 +253,7 @@ public class ServerPlayer extends Player {
@@ -254,6 +254,7 @@ public class ServerPlayer extends Player {
// CraftBukkit end
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
public boolean purpurClient = false; // Purpur
@@ -16,7 +16,7 @@ index 89189f12f467b6b97569553d3af47b14068a6a23..3697b25a60811e4b73d281b49e47d61c
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -329,6 +330,7 @@ public class ServerPlayer extends Player {
@@ -330,6 +331,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 89189f12f467b6b97569553d3af47b14068a6a23..3697b25a60811e4b73d281b49e47d61c
}
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
@@ -1005,6 +1007,12 @@ public class ServerPlayer extends Player {
@@ -1010,6 +1012,12 @@ public class ServerPlayer extends Player {
}
@@ -37,7 +37,7 @@ index 89189f12f467b6b97569553d3af47b14068a6a23..3697b25a60811e4b73d281b49e47d61c
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1012,7 +1020,7 @@ public class ServerPlayer extends Player {
@@ -1017,7 +1025,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -46,7 +46,7 @@ index 89189f12f467b6b97569553d3af47b14068a6a23..3697b25a60811e4b73d281b49e47d61c
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1185,6 +1193,7 @@ public class ServerPlayer extends Player {
@@ -1190,6 +1198,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index 89189f12f467b6b97569553d3af47b14068a6a23..3697b25a60811e4b73d281b49e47d61c
return this;
}
}
@@ -1959,6 +1968,7 @@ public class ServerPlayer extends Player {
@@ -1964,6 +1973,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index 89189f12f467b6b97569553d3af47b14068a6a23..3697b25a60811e4b73d281b49e47d61c
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2468,9 +2478,17 @@ public class ServerPlayer extends Player {
@@ -2473,9 +2483,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -82,7 +82,7 @@ index 89189f12f467b6b97569553d3af47b14068a6a23..3697b25a60811e4b73d281b49e47d61c
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 81de9d96c1d3b36a3616ba824878c04b4d4fa745..cd2b66289bd3bfa62460923ce00883209451903d 100644
index 4cfa7f9480339d1d3e3e024c6afe258dfcec31ea..3518e5748e6f380eb53abc29a9483f58278c44ec 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1983,12 +1983,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -108,7 +108,7 @@ index 81de9d96c1d3b36a3616ba824878c04b4d4fa745..cd2b66289bd3bfa62460923ce0088320
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 a2af387c671f344d1b302e5aceab0be42c80756f..6ad2ccf91a384bf431e3716d374f0eb45c6c0fe8 100644
index e4e0db7d94ab7c86f3bdd8be17f85d6ea403b313..b9438bfd5f0949995d64e7c2ca0acd43f13fec76 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1004,6 +1004,8 @@ public abstract class PlayerList {
@@ -121,10 +121,10 @@ index a2af387c671f344d1b302e5aceab0be42c80756f..6ad2ccf91a384bf431e3716d374f0eb4
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 a95b245ca2fa333085b0fc47f2cc5c5e96dcd075..d017e5a7f509659cdd11c10d76030f34f0c87319 100644
index 75a38684e790a1d551d0b694a0b2aa8545a10f74..d5c3f212b78fcd453ec268a2f85bc7e8e2de1a56 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2729,5 +2729,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2815,5 +2815,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}