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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
2f0e0a6d Backport feature search improvement from 1.17 (Fixes #2312) (#4771)
b6d9d634 Add API for quit reason
This commit is contained in:
BillyGalbreath
2020-11-14 19:06:39 -06:00
parent be5fcdd8d7
commit 519ac08d10
17 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
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 c7cf49897..fd7099adc 100644
index 694159cca..ddef5d06f 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -147,6 +147,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -148,6 +148,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 c7cf49897..fd7099adc 100644
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -977,6 +979,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -978,6 +980,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -30,7 +30,7 @@ index c7cf49897..fd7099adc 100644
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -984,7 +992,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -985,7 +993,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 c7cf49897..fd7099adc 100644
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1155,6 +1163,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1156,6 +1164,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
// CraftBukkit end
}
@@ -47,7 +47,7 @@ index c7cf49897..fd7099adc 100644
return this;
}
}
@@ -2298,9 +2307,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2299,9 +2308,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public
@@ -67,10 +67,10 @@ index c7cf49897..fd7099adc 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 4365d0bbb..727975c26 100644
index 13da04e5b..11473f06b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1652,6 +1652,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1653,6 +1653,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 4365d0bbb..727975c26 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 1faefcb5d..9aa6998c6 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 {