Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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:
PaperMC/Paper@eb48ada Merge chunk task urgent executor thread into the worker queue
PaperMC/Paper@d9fb602 Expose vanilla BiomeProvider from WorldInfo (#7295)
PaperMC/Paper@7d7ae7b Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7246)
This commit is contained in:
BillyGalbreath
2022-01-09 00:27:01 -06:00
parent 9c51f21c2e
commit e85e5ebc2e
22 changed files with 84 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0011-AFK-API.patch
View File

@@ -182,7 +182,7 @@ index e752c83df50fb9b670ecea2abc95426c2a009b6f..baa4f9026d31de92210300ecb8ee8c1b
if (baseEntity == null) {
if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) {
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 957808b534592fd50cac78d2209a38c37950cb22..aad9de4019015ca42ad5509886ca35315aeb30d9 100644
index a706ab000eba2d996862a73a3bd38f1971b31b82..fd83ec264d2d2dabadd50a73065ba61544196bfa 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -194,6 +194,13 @@ public abstract class Player extends LivingEntity {
@@ -305,13 +305,13 @@ index 373bdce6590564bd9de4a571a91bbf05e287ee08..27d70e8e29902fe4275200cf75082980
public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false;
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 2eb9bc34afdc26bed21bc9d3e97f636cfc97f166..e12ba58f3795c17694defa308ced50a19d2a37b9 100644
index 8d3147b48eff5418f452eb1449639316399942ee..d3c84417596a56e38012f2d0cee4203a1b875ac2 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -199,6 +199,7 @@ public class ActivationRange
{
@@ -203,6 +203,7 @@ public class ActivationRange
continue;
}
player.activatedTick = MinecraftServer.currentTick;
+ if (!player.level.purpurConfig.idleTimeoutTickNearbyEntities && player.isAfk()) continue; // Purpur
ActivationRange.maxBB = player.getBoundingBox().inflate( maxRange, 256, maxRange );
ActivationType.MISC.boundingBox = player.getBoundingBox().inflate( miscActivationRange, 256, miscActivationRange );