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

Paper Changes:
fb36f15d6 Let some more packets be send immediately, closes #4140 (#4896)
ede41fe16 Emancipate more features to PlayerHandshakeEvent
3fdeba1f5 [CI-SKIP] [Auto] Rebuild Patches
5fc07bd63 Maded Title-Objects directy sendable to targets
e7b9a478e Player Chunk Load/Unload Events
1d0cfc0cc MC-4 Fix item position desync
458db6206 Limit auto recipe packets
This commit is contained in:
BillyGalbreath
2020-12-16 18:05:35 -06:00
parent 2edb086e13
commit 391f9addfd
150 changed files with 119 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0018-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 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a11ada49a4 100644
index 08a3875d7a6b8a003ba133a835dcdd75849383ae..5c4d9b1f4e926909439b9c290d7cc5726cb8822e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -148,6 +148,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -150,6 +150,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 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -978,6 +980,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -980,6 +982,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -30,7 +30,7 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -985,7 +993,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -987,7 +995,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 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1156,6 +1164,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1158,6 +1166,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
// CraftBukkit end
}
@@ -47,7 +47,7 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1
return this;
}
}
@@ -2299,9 +2308,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2311,9 +2320,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public
@@ -67,10 +67,10 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1
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 347675d6dbf3bffeda45babb584fb2a11778fa44..b0f154080fde4ad3ce03655d3e42953accb1edd6 100644
index 3a1016e345282eab9408c9caa294e7b7e01482f9..b59e82d8ca3132f448aba892741585406cdc023e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1651,6 +1651,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1656,6 +1656,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];