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 & Tuinity)

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

Paper Changes:
e4633ca27 [Auto] Updated Upstream (Bukkit/CraftBukkit)
a23be44da [Auto] Updated Upstream (CraftBukkit)
e40ea889d [CI-SKIP] Deprecate the view distance APIs on Player (#4945)
d9fd54e16 Do not crash from invalid ingredient lists in VillagerAcquireTradeEvent
24388381a Fix lead duplication

Tuinity Changes:
09423b6 Update to Starlight 0.0.2-RC3
f06591a Update Upstream (Paper)
d2aa70f Revert special block lookup for chunksection
This commit is contained in:
BillyGalbreath
2020-12-28 01:21:49 -06:00
parent 7152b72d25
commit 3d455ff2d5
41 changed files with 2405 additions and 1221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0018-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ 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 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2916cd7d2 100644
index 76d42805a4616da11c06b492590a9d52e979a4b7..77603a4819c02d73d4b058a8a3d822ae6a4cb505 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -150,6 +150,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -980,6 +982,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -991,6 +993,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -30,7 +30,7 @@ index 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -987,7 +995,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -998,7 +1006,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 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1158,6 +1166,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1169,6 +1177,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
// CraftBukkit end
}
@@ -47,7 +47,7 @@ index 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2
return this;
}
}
@@ -2311,9 +2320,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2322,9 +2331,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public