Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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:
64666dc8 Improve Chunk Priority, Frustum Priority and Load Speed Algorithms
146b9908 Improve ChunkMapDistance.b crash fix to clean up properly
2c4499b7 Show Plugins Event Listeners under Combined Total in Timings
c5c909c9 Improve Plugin Ticket Management
b20529f3 Update to HTTPS in README (#3460)
de6dfedf Make Anti-Xray multithreaded (#3520)
531c4b3f Add PluginTickets to API Chunk Methods
b2d81e21 Improve Chunk Prioritization and Internal Scheduler
24a2e804 Improve Login to use Urgent priority - improves login chunk load times
This commit is contained in:
William Blake Galbreath
2020-06-10 00:29:38 -05:00
parent 2fbbafa299
commit bbcde382a2
15 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From b7f030b1ffc4c53737500f213803d6a7e6f2628c Mon Sep 17 00:00:00 2001
From 11fad2bb95551473eb3b77b0d52aed82d1151afe 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 18a74607fc..90305b61fc 100644
index 9773923735..6572177c55 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -131,6 +131,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -132,6 +132,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 18a74607fc..90305b61fc 100644
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -736,6 +738,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -743,6 +745,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -37,7 +37,7 @@ index 18a74607fc..90305b61fc 100644
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -743,7 +751,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -750,7 +758,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 18a74607fc..90305b61fc 100644
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1010,6 +1018,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1017,6 +1025,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 18a74607fc..90305b61fc 100644
return this;
}
}
@@ -1998,9 +2008,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2005,9 +2015,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public
@@ -75,10 +75,10 @@ index 18a74607fc..90305b61fc 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 0cd012dfc3..91e6952f4c 100644
index 80a75912fb..3a1aa1d4da 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1530,6 +1530,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1531,6 +1531,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -87,10 +87,10 @@ index 0cd012dfc3..91e6952f4c 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 55cda3dd66..d2ab05b51e 100644
index 29150bd7d7..7b912d46f6 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -824,6 +824,8 @@ public abstract class PlayerList {
@@ -827,6 +827,8 @@ public abstract class PlayerList {
}
// Paper end
@@ -122,10 +122,10 @@ index efdc176e64..81969d2dc9 100644
playerSleepCondition = getString("gameplay-mechanics.player.sleep.condition", playerSleepCondition);
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7bd271d4c2..24e35ffeaf 100644
index e15c123878..137699c3e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2094,5 +2094,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2102,5 +2102,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetIdleTimer();
}
@@ -147,5 +147,5 @@ index 7bd271d4c2..24e35ffeaf 100644
// Purpur end
}
--
2.24.0
2.26.2