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

update paper

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-06-16 06:35:33 -04:00
parent 3d79a61a25
commit 7c6752fe1d
15 changed files with 76 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/server/0015-Player-invulnerabilities.patch
View File

@@ -5,18 +5,18 @@ 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 2ddce62629be9fc1af38306ca50ad3e81150f94c..3e89650de727069aa27cc86196937cd71770ed4c 100644
index f3842754684dcf3d27aa84ba51e61a48475a16aa..02965cc9ca344cd9673ed3361f7c28b829a2d97b 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -331,6 +331,7 @@ public class ServerPlayer extends Player {
@@ -324,6 +324,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
public BlockPos getPointInFront(double inFront) {
@@ -963,6 +964,12 @@ public class ServerPlayer extends Player {
// Yes, this doesn't match Vanilla, but it's the best we can do for now.
@@ -940,6 +941,12 @@ public class ServerPlayer extends Player {
}
@@ -29,7 +29,7 @@ index 2ddce62629be9fc1af38306ca50ad3e81150f94c..3e89650de727069aa27cc86196937cd7
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -970,7 +977,7 @@ public class ServerPlayer extends Player {
@@ -947,7 +954,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -38,7 +38,7 @@ index 2ddce62629be9fc1af38306ca50ad3e81150f94c..3e89650de727069aa27cc86196937cd7
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1145,6 +1152,7 @@ public class ServerPlayer extends Player {
@@ -1122,6 +1129,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -46,7 +46,7 @@ index 2ddce62629be9fc1af38306ca50ad3e81150f94c..3e89650de727069aa27cc86196937cd7
return this;
}
}
@@ -2363,8 +2371,16 @@ public class ServerPlayer extends Player {
@@ -2340,8 +2348,16 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -65,10 +65,10 @@ index 2ddce62629be9fc1af38306ca50ad3e81150f94c..3e89650de727069aa27cc86196937cd7
@Override
public Scoreboard getScoreboard() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index c2d4c8dc38f2bdf376a02b243e1b8fba8b133979..7700bad94ad07bfac4a5efd90689f26bec1eed45 100644
index 9d9390b2670353a5201d75418132993c51890298..900bb6b5fdb9e1f07b8d8aef5539844cc6266839 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1861,6 +1861,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1860,6 +1860,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
}
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action.ordinal()];
@@ -77,10 +77,10 @@ index c2d4c8dc38f2bdf376a02b243e1b8fba8b133979..7700bad94ad07bfac4a5efd90689f26b
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 bc3fe18dd32da2d381b9546aae675a475c073696..ef5315298bde3a82de75f1f9099d6298a1345a5d 100644
index b0b4c6a3c6a8ffda142efd13596349f99a8e9daf..3c1e2c69b4661e3085b95f212737f0010711e888 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -984,6 +984,8 @@ public abstract class PlayerList {
@@ -981,6 +981,8 @@ public abstract class PlayerList {
}
// Paper end
@@ -106,10 +106,10 @@ index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 391d7ebe71b7e741f058566cc5cdb9bb6a5a879a..b76a4bee5bae4278053adc311ab1b865ed263c6b 100644
index 761e55ae057584eec937217c66029ffbaa710d0d..facb191a7e10df05e43da674918e7049e0eedb5d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2462,5 +2462,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2459,5 +2459,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}