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

Update to 1.19.1

Browse Source
This commit is contained in:
BillyGalbreath
2022-07-27 23:53:11 -05:00
parent 85f63e5df0
commit f1c4bad9ce
263 changed files with 522 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
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 14b778756bc7e0a6ad1996c23d142ccb3431ef04..92e627494e0c0c49c252f546563f115fb3beb296 100644
index f2e84f02ee8c9c4e4cb2fa5ca27c2df5bf4fcfdb..e7399e71db7ca5671a4570f4e605497b2b2fa0cb 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
// CraftBukkit end
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
public boolean purpurClient = false; // Purpur
@@ -16,7 +16,7 @@ index 14b778756bc7e0a6ad1996c23d142ccb3431ef04..92e627494e0c0c49c252f546563f115f
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -338,6 +339,7 @@ public class ServerPlayer extends Player {
@@ -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
@@ -24,7 +24,7 @@ index 14b778756bc7e0a6ad1996c23d142ccb3431ef04..92e627494e0c0c49c252f546563f115f
}
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
@@ -1020,6 +1022,12 @@ public class ServerPlayer extends Player {
@@ -1018,6 +1020,12 @@ public class ServerPlayer extends Player {
}
@@ -37,7 +37,7 @@ index 14b778756bc7e0a6ad1996c23d142ccb3431ef04..92e627494e0c0c49c252f546563f115f
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1027,7 +1035,7 @@ public class ServerPlayer extends Player {
@@ -1025,7 +1033,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -46,7 +46,7 @@ index 14b778756bc7e0a6ad1996c23d142ccb3431ef04..92e627494e0c0c49c252f546563f115f
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1200,6 +1208,7 @@ public class ServerPlayer extends Player {
@@ -1198,6 +1206,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index 14b778756bc7e0a6ad1996c23d142ccb3431ef04..92e627494e0c0c49c252f546563f115f
return this;
}
}
@@ -1993,6 +2002,7 @@ public class ServerPlayer extends Player {
@@ -1982,6 +1991,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index 14b778756bc7e0a6ad1996c23d142ccb3431ef04..92e627494e0c0c49c252f546563f115f
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2518,9 +2528,17 @@ public class ServerPlayer extends Player {
@@ -2507,9 +2517,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -82,10 +82,10 @@ index 14b778756bc7e0a6ad1996c23d142ccb3431ef04..92e627494e0c0c49c252f546563f115f
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 bd7769c9511685bbf96e5bb80108a99508cb82d4..b51608b2eaaaa4bf4b89fbd379aa649c3a219c38 100644
index 85d18e94ee93f1348871eca697c723eb5482db6b..9bdaaa3f7845e300ad172d5167daa4187aa6fb0c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2009,12 +2009,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -2075,12 +2075,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
@@ -108,10 +108,10 @@ index bd7769c9511685bbf96e5bb80108a99508cb82d4..b51608b2eaaaa4bf4b89fbd379aa649c
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 5f5ec3269a5856aa9e00df475901f5d13da3c6f6..f8699be5fed37f86445f9ee513e737ba6bcec161 100644
index 3c9d72dd1a1bade79e4c8b5e6c7b136f906ba77d..02707189e0cafcb8db31413566f2078495866434 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1007,6 +1007,8 @@ public abstract class PlayerList {
@@ -1008,6 +1008,8 @@ public abstract class PlayerList {
}
// Paper end
@@ -121,10 +121,10 @@ index 5f5ec3269a5856aa9e00df475901f5d13da3c6f6..f8699be5fed37f86445f9ee513e737ba
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 271387c0f5e011846507a0dd8dbf2445ca2ff7ed..c5cb4060bbe39f6ae73170369e807789bfb2ae54 100644
index 69084657049dccad5ba26d22668e8930ff086be8..f01633819138fabe782bb2897ae2488b0d376278 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2901,5 +2901,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2907,5 +2907,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}