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

update paper

Browse Source
This commit is contained in:
BillyGalbreath
2021-06-18 22:59:02 -05:00
parent 9a48162500
commit df6e24a868
29 changed files with 120 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0017-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 686bbbde55a61e4f78f4d0991b06b581b34ddec5..4ab52c4bca5c938ef8667acfb41bcceec1c5a89b 100644
index f6289be625d61ac3e33118959e8a1bc3defcda42..660649624281928ab4eb79f09a90e2f9facf36d6 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -332,6 +332,7 @@ public class ServerPlayer extends Player {
@@ -333,6 +333,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 686bbbde55a61e4f78f4d0991b06b581b34ddec5..4ab52c4bca5c938ef8667acfb41bccee
}
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
@@ -973,6 +974,12 @@ public class ServerPlayer extends Player {
@@ -974,6 +975,12 @@ public class ServerPlayer extends Player {
}
@@ -29,7 +29,7 @@ index 686bbbde55a61e4f78f4d0991b06b581b34ddec5..4ab52c4bca5c938ef8667acfb41bccee
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -980,7 +987,7 @@ public class ServerPlayer extends Player {
@@ -981,7 +988,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -38,7 +38,7 @@ index 686bbbde55a61e4f78f4d0991b06b581b34ddec5..4ab52c4bca5c938ef8667acfb41bccee
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1155,6 +1162,7 @@ public class ServerPlayer extends Player {
@@ -1156,6 +1163,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -46,7 +46,7 @@ index 686bbbde55a61e4f78f4d0991b06b581b34ddec5..4ab52c4bca5c938ef8667acfb41bccee
return this;
}
}
@@ -2373,8 +2381,16 @@ public class ServerPlayer extends Player {
@@ -2374,8 +2382,16 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -65,10 +65,10 @@ index 686bbbde55a61e4f78f4d0991b06b581b34ddec5..4ab52c4bca5c938ef8667acfb41bccee
@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 3792cb44df997e72d902f26fe09590b1c5c7e814..963e433db7c237119355f645ee3d8aa674c77259 100644
index f29f05ab4bace2a6db23ef6b9d4c9db285a082e0..5f54905841956b691bf83a4d980c24e0969e9456 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 3792cb44df997e72d902f26fe09590b1c5c7e814..963e433db7c237119355f645ee3d8aa6
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 d6ecf7671663957b27ee0cadbfc57ce3a7be161c..bcff95d97549f56f542644f8348a84088ab56846 100644
index d76d8d8db7921d16f87dd162ccd115e351cde106..fb29b0cb962db93489ff4268c72e7c67cd736867 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -983,6 +983,8 @@ public abstract class PlayerList {
@@ -984,6 +984,8 @@ public abstract class PlayerList {
}
// Paper end
@@ -108,10 +108,10 @@ index b8cc0ac7790379103c1849c5dcad4bec8669463f..f707437272ff862ed1e0a4e53b17eb86
public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ae1c605dc3e35117e754884581364cf932670420..830a17bb29123b7ce84ebd6b44a4ebc28ea94954 100644
index 38b7bc0399be51eec4c00e5ce1240d7468878aea..676d98f183d798f1ea894cd78539f9034edb3659 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2487,5 +2487,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2489,5 +2489,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}