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

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

Paper Changes:
dc7b7a160 Fix missing username console death message (#5654) (#5658)
c639a52a6 Add basic Datapack API (#5653) (#5653)
99c1d9da6 Updated Upstream (CraftBukkit) (#5652)
2d50c17e2 [CI-SKIP] Add PR rebasing steps (#5634)
2c5f8085e Remove boat interaction event (Fixes #5539)
96ee1fb8f fix WorldSaveEvent not firing with /save-all (#5650)
e90e7829e remove unneeded patch (#5641)
d875bacc2 Activate warning by default when people are doing silly things (#5642)
cb896d471 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5643)
ecbf5a38e Revert "Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5636)"
20fc4ab70 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5636)
20d8812ea Fix CraftPotionBrewer cache (#5632)

Tuinity Changes:
1222573d0 Fix incorrect status dataconverter for pre 1.13 chunks
This commit is contained in:
BillyGalbreath
2021-05-16 19:10:49 -05:00
parent c166841a77
commit dc4a1cba43
35 changed files with 161 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0017-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
index 45022ac20bea298630e151bf50b2e3322bef3b9a..0183a291efb849873a16011e76e587dbea41ee23 100644
index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3e2f6d4f4 100644
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
@@ -284,6 +284,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -285,6 +285,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 45022ac20bea298630e151bf50b2e3322bef3b9a..0183a291efb849873a16011e76e587db
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -1119,6 +1121,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1120,6 +1122,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -30,7 +30,7 @@ index 45022ac20bea298630e151bf50b2e3322bef3b9a..0183a291efb849873a16011e76e587db
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -1126,7 +1134,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1127,7 +1135,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 45022ac20bea298630e151bf50b2e3322bef3b9a..0183a291efb849873a16011e76e587db
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1302,6 +1310,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1303,6 +1311,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// Paper end
@@ -47,7 +47,7 @@ index 45022ac20bea298630e151bf50b2e3322bef3b9a..0183a291efb849873a16011e76e587db
return this;
}
}
@@ -2495,9 +2504,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2504,9 +2513,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public