Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +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:
2b4ce0b37 Restore incremental player saving
This commit is contained in:
William Blake Galbreath
2020-08-16 10:00:17 -05:00
parent 9a376d0423
commit e1abdd5ab5
12 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0025-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 ecd0cd7752..2ff7e6e576 100644
index d971f02354..aee6e73708 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -141,6 +141,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -142,6 +142,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 ecd0cd7752..2ff7e6e576 100644
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -801,6 +803,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -802,6 +804,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -30,7 +30,7 @@ index ecd0cd7752..2ff7e6e576 100644
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -808,7 +816,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -809,7 +817,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 ecd0cd7752..2ff7e6e576 100644
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1054,6 +1062,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1055,6 +1063,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.world.getServer().getPluginManager().callEvent(changeEvent);
// CraftBukkit end
@@ -47,7 +47,7 @@ index ecd0cd7752..2ff7e6e576 100644
return this;
}
}
@@ -2149,9 +2158,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2150,9 +2159,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public
@@ -79,10 +79,10 @@ index b28bdaabbe..9cbf3e63ea 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 9382e8f79e..7309d8be28 100644
index 38d83bb318..69118d7d7c 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -890,6 +890,8 @@ public abstract class PlayerList {
@@ -891,6 +891,8 @@ public abstract class PlayerList {
}
// Paper end