mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: df984898 Fix server deadlock when loading some chunks (#2647) 9ea1f9ee performance improvement for CraftChunk.getEntities() (#2629)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 3d51b3ae4c5a605a6037aa6bec21c593859dfe24 Mon Sep 17 00:00:00 2001
|
||||
From 932bc8077657edda8bc84b0ae54b86d7a54feae5 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 8 Aug 2019 15:29:15 -0500
|
||||
Subject: [PATCH] Implement AFK API
|
||||
@@ -205,10 +205,10 @@ index 30595523e6..6f584d515f 100644
|
||||
if (from.getX() != Double.MAX_VALUE) {
|
||||
Location oldTo = to.clone();
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 44729ae11a..56133d54fa 100644
|
||||
index 62e938a78f..5e51dbf172 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -356,7 +356,7 @@ public class WorldServer extends World {
|
||||
@@ -359,7 +359,7 @@ public class WorldServer extends World {
|
||||
}
|
||||
|
||||
if (this.C && this.players.stream().noneMatch((entityplayer) -> {
|
||||
@@ -217,7 +217,7 @@ index 44729ae11a..56133d54fa 100644
|
||||
})) {
|
||||
this.C = false;
|
||||
if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) {
|
||||
@@ -623,7 +623,7 @@ public class WorldServer extends World {
|
||||
@@ -626,7 +626,7 @@ public class WorldServer extends World {
|
||||
while (iterator.hasNext()) {
|
||||
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user