Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/server/0019-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 011ebba656174cb415d43244c50db250fa8f0a30..1653928faba2422bfa5fff93be5b4d8f9c9447ed 100644
index 687f1bfa07246e2297be7124edf5bf7568a7ce09..335893049b3625a80cef78526eff3761cd8d5fbf 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -338,6 +338,7 @@ public class ServerPlayer extends Player {
@@ -334,6 +334,7 @@ public class ServerPlayer extends Player {
this.bukkitPickUpLoot = true;
this.maxHealthCache = this.getMaxHealth();
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -16,7 +16,7 @@ index 011ebba656174cb415d43244c50db250fa8f0a30..1653928faba2422bfa5fff93be5b4d8f
}
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
@@ -979,6 +980,12 @@ public class ServerPlayer extends Player {
@@ -975,6 +976,12 @@ public class ServerPlayer extends Player {
}
@@ -29,7 +29,7 @@ index 011ebba656174cb415d43244c50db250fa8f0a30..1653928faba2422bfa5fff93be5b4d8f
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -986,7 +993,7 @@ public class ServerPlayer extends Player {
@@ -982,7 +989,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -38,7 +38,7 @@ index 011ebba656174cb415d43244c50db250fa8f0a30..1653928faba2422bfa5fff93be5b4d8f
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1161,6 +1168,7 @@ public class ServerPlayer extends Player {
@@ -1157,6 +1164,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -46,7 +46,7 @@ index 011ebba656174cb415d43244c50db250fa8f0a30..1653928faba2422bfa5fff93be5b4d8f
return this;
}
}
@@ -2415,9 +2423,17 @@ public class ServerPlayer extends Player {
@@ -2409,9 +2417,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -66,10 +66,10 @@ index 011ebba656174cb415d43244c50db250fa8f0a30..1653928faba2422bfa5fff93be5b4d8f
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 210b774eae5d76823e171016e9e6b706e8da4f07..550ff06264aa4fffdd9b9291efec121ac034d963 100644
index c5863036c0fdeee755494dfc55c527f4696c92c1..74eee0b4865582ea88396ad69fc9278535777dae 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1938,6 +1938,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1840,6 +1840,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
}
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action.ordinal()];
@@ -78,10 +78,10 @@ index 210b774eae5d76823e171016e9e6b706e8da4f07..550ff06264aa4fffdd9b9291efec121a
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 ec98fb6d4a407d5be8faf64db0d73e935e16623d..3961f1908876206b86126a672b691bfc571ea2f0 100644
index c647a768a10076969f81fed33cefb7a4aa3b8597..f2c328c52c127eb48b6c4ab4e1348a1bfd75c299 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -991,6 +991,8 @@ public abstract class PlayerList {
@@ -992,6 +992,8 @@ public abstract class PlayerList {
}
// Paper end
@@ -91,10 +91,10 @@ index ec98fb6d4a407d5be8faf64db0d73e935e16623d..3961f1908876206b86126a672b691bfc
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ec0cef53349bc20e936adbbe6138145bcaca945d..578e1685e6b5e2febae463d836071aa2b8144200 100644
index bfc1077dc7d5cfb48f5cc98b289b98d44474280e..90a312246e5ecdd4bbe4bc7e360ea7aa6a64953f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -97,11 +97,15 @@ public class PurpurWorldConfig {
@@ -96,11 +96,15 @@ public class PurpurWorldConfig {
public boolean idleTimeoutTickNearbyEntities = true;
public boolean idleTimeoutCountAsSleeping = false;
public boolean idleTimeoutUpdateTabList = false;
@@ -111,10 +111,10 @@ index ec0cef53349bc20e936adbbe6138145bcaca945d..578e1685e6b5e2febae463d836071aa2
public boolean babiesAreRidable = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3eeb138d060f86e0f928fc59234563528d83bf65..2e42abb396b84b9f6d42809086f5a513dbc9ef40 100644
index d858590b7ffea28dcfbc48973df6e3c916886b65..3306decd607ae190d6eaf674b3a59393c93dae34 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2550,5 +2550,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2496,5 +2496,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}