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 appears to apply and compile correctly

Paper Changes:
372dc10f Updated Upstream (CraftBukkit) (#4760)
d6fb9717 Updated Upstream (CraftBukkit)

Tuinity Changes:
2194b64 Optimizations (starlight, aka leaflight)
1a412ae Fix worldborder crash
957a2ef Fix chunk object leak
bcfe550 Re-Add unload poi data patch
This commit is contained in:
BillyGalbreath
2020-11-14 06:55:31 -06:00
parent f513a2f49b
commit 21e0b98494
23 changed files with 5714 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0021-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 77156ecff2..1360127549 100644
index c7cf49897..fd7099adc 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 {
@@ -17,7 +17,7 @@ index 77156ecff2..1360127549 100644
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -809,6 +811,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -977,6 +979,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -30,7 +30,7 @@ index 77156ecff2..1360127549 100644
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -816,7 +824,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -984,7 +992,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 77156ecff2..1360127549 100644
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -987,6 +995,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1155,6 +1163,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
// CraftBukkit end
}
@@ -47,7 +47,7 @@ index 77156ecff2..1360127549 100644
return this;
}
}
@@ -2130,9 +2139,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2298,9 +2307,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public
@@ -67,7 +67,7 @@ index 77156ecff2..1360127549 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 4365d0bbb5..727975c26b 100644
index 4365d0bbb..727975c26 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 {
@@ -79,7 +79,7 @@ index 4365d0bbb5..727975c26b 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 38f26e25cb..c92a703da4 100644
index 38f26e25c..c92a703da 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 {
@@ -92,7 +92,7 @@ index 38f26e25cb..c92a703da4 100644
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2578a4677d..c441fcea9b 100644
index 2578a4677..c441fcea9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -67,4 +67,11 @@ public class PurpurWorldConfig {
@@ -108,7 +108,7 @@ index 2578a4677d..c441fcea9b 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 93c8f9fc8d..21dc18c653 100644
index 93c8f9fc8..21dc18c65 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2232,5 +2232,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {