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

Updated Upstream (Paper)

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

Paper Changes:
70df8f27 Add PrepareGrindstoneEvent
24b2f54b Fix Player skulls for offline mode servers
ce270e14 Updated Upstream (Bukkit/CraftBukkit/Spigot)
c4ada0e1 Fix many chunk loading issues
37b244b5 Fix not running level updates for light if no pre/post task
e6142995 Add and implement PlayerRecipeBookClickEvent (#3351)
9bb4e930 Fix piston dupe patch creating ghost blocks (#3603)
This commit is contained in:
William Blake Galbreath
2020-06-23 14:20:44 -05:00
parent 07c44e35f2
commit 05a85435d2
27 changed files with 115 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0114-Player-invulnerabilities.patch
View File

@@ -1,4 +1,4 @@
From 6601b605fd122327b6cf4d6dbde13ff5ee278649 Mon Sep 17 00:00:00 2001
From 7c51cf494632ddcecb2ee18c559a9930f3b4a681 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 2 May 2020 20:55:44 -0500
Subject: [PATCH] Player invulnerabilities
@@ -12,10 +12,10 @@ Subject: [PATCH] Player invulnerabilities
5 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 977392373..6572177c5 100644
index 3e0e49dbb..e73b33721 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -132,6 +132,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -137,6 +137,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
@@ -24,7 +24,7 @@ index 977392373..6572177c5 100644
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -743,6 +745,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -748,6 +750,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -37,7 +37,7 @@ index 977392373..6572177c5 100644
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -750,7 +758,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -755,7 +763,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} else {
boolean flag = this.server.m() && this.canPvP() && "fall".equals(damagesource.translationIndex);
@@ -46,7 +46,7 @@ index 977392373..6572177c5 100644
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1017,6 +1025,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1022,6 +1030,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
this.world.getServer().getPluginManager().callEvent(changeEvent);
// CraftBukkit end
@@ -55,7 +55,7 @@ index 977392373..6572177c5 100644
return this;
}
}
@@ -2005,9 +2015,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2010,9 +2020,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public
@@ -75,7 +75,7 @@ index 977392373..6572177c5 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 00a30519d..2eeeed017 100644
index 82faee937..86715ff3c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1548,6 +1548,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -87,10 +87,10 @@ index 00a30519d..2eeeed017 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 29150bd7d..7b912d46f 100644
index af2cdbf4d..5cacea602 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -827,6 +827,8 @@ public abstract class PlayerList {
@@ -828,6 +828,8 @@ public abstract class PlayerList {
}
// Paper end