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

Update to 1.16.4 ^_^

Browse Source
This commit is contained in:
William Blake Galbreath
2020-11-03 01:27:33 -06:00
parent 0fa478d031
commit 03654a6880
58 changed files with 472 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0021-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 3d7729880..58d042b47 100644
index 656d30bbbb..7eb0f515aa 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -144,6 +144,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -147,6 +147,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.canPickUpLoot = true;
this.maxHealthCache = this.getMaxHealth();
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -17,7 +17,7 @@ index 3d7729880..58d042b47 100644
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -806,6 +808,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -809,6 +811,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -30,7 +30,7 @@ index 3d7729880..58d042b47 100644
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -813,7 +821,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -816,7 +824,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} else {
boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
@@ -39,7 +39,7 @@ index 3d7729880..58d042b47 100644
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -984,6 +992,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -987,6 +995,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
// CraftBukkit end
}
@@ -47,7 +47,7 @@ index 3d7729880..58d042b47 100644
return this;
}
}
@@ -2122,9 +2131,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2130,9 +2139,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public
@@ -67,10 +67,10 @@ index 3d7729880..58d042b47 100644
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ecc0e2e40..88254f69e 100644
index cd37d71986..c783d583f0 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1576,6 +1576,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1650,6 +1650,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -79,7 +79,7 @@ index ecc0e2e40..88254f69e 100644
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 38f26e25c..c92a703da 100644
index 38f26e25cb..c92a703da4 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -905,6 +905,8 @@ public abstract class PlayerList {
@@ -92,7 +92,7 @@ index 38f26e25c..c92a703da 100644
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2578a4677..c441fcea9 100644
index 2578a4677d..c441fcea9b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -67,4 +67,11 @@ public class PurpurWorldConfig {
@@ -108,7 +108,7 @@ index 2578a4677..c441fcea9 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6db07713e..7d04913f9 100644
index 6db07713ef..7d04913f9b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2208,5 +2208,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {