diff --git a/patches/api/0001-POM-Changes.patch b/patches/api/0001-POM-Changes.patch index e32cf5723..16b45c00a 100644 --- a/patches/api/0001-POM-Changes.patch +++ b/patches/api/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From d2a5a76f2c5049f7680064c6a816827cc0b67126 Mon Sep 17 00:00:00 2001 +From 906bfeb4ed3a2e038a73008dc4b7b4faae011118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 14 Dec 2018 21:52:29 -0800 diff --git a/patches/api/0002-Add-server-configuration.patch b/patches/api/0002-Add-server-configuration.patch index 29f0f06f8..7ba1d13b8 100644 --- a/patches/api/0002-Add-server-configuration.patch +++ b/patches/api/0002-Add-server-configuration.patch @@ -1,4 +1,4 @@ -From fc5de7aaa87eec1126570448a02efc3966d5f992 Mon Sep 17 00:00:00 2001 +From 18f5ea789335a3cdc656e8fd229143d943049758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 3 Apr 2020 15:18:38 +0800 diff --git a/patches/server/0001-Fix-errors-on-eclipse.patch b/patches/server/0001-Fix-errors-on-eclipse.patch index 6436d26ac..00da05b53 100644 --- a/patches/server/0001-Fix-errors-on-eclipse.patch +++ b/patches/server/0001-Fix-errors-on-eclipse.patch @@ -1,4 +1,4 @@ -From 1ebfe4bf97bbd1709f2fafca968377d89fff64c0 Mon Sep 17 00:00:00 2001 +From 3f169315d96829634d257991bcc4c7ea53ab86a9 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 00:52:56 +0700 Subject: [PATCH] Fix errors on eclipse diff --git a/patches/server/0002-POM-Changes.patch b/patches/server/0002-POM-Changes.patch index 8a2a24425..e1d52fbca 100644 --- a/patches/server/0002-POM-Changes.patch +++ b/patches/server/0002-POM-Changes.patch @@ -1,4 +1,4 @@ -From 152babea47e6b0b47f2b4ef9c449a4d5fa5c2d77 Mon Sep 17 00:00:00 2001 +From 6d51bcb384227ec5d643ea106b484646bfa3b168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 14 Dec 2018 21:53:58 -0800 diff --git a/patches/server/0003-Brand-changes.patch b/patches/server/0003-Brand-changes.patch index fa3e8df34..fe30f22be 100644 --- a/patches/server/0003-Brand-changes.patch +++ b/patches/server/0003-Brand-changes.patch @@ -1,4 +1,4 @@ -From 79d5507cb69d3dea3421cafb81391890a10f25c9 Mon Sep 17 00:00:00 2001 +From 39968202da6663de5a974ea6c4c0cc2b25666aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Tue, 18 Dec 2018 06:27:02 -0800 diff --git a/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch b/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch index f008ac897..2f86b88e8 100644 --- a/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch +++ b/patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch @@ -1,4 +1,4 @@ -From 5d56a0ceb8eb374d71486d1f412db78d1c43c42f Mon Sep 17 00:00:00 2001 +From 6e129730e5864895bcea6f796a2c5ae45ec8387b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:29:08 +0800 diff --git a/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch b/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch index 05d10e55a..58ad0c856 100644 --- a/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch +++ b/patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch @@ -1,4 +1,4 @@ -From 311082a5804ea3416df10b02018d353fac31c605 Mon Sep 17 00:00:00 2001 +From edd7c3a394f752b3633f80c70d2452469061406d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:43:20 +0800 diff --git a/patches/server/0006-Never-drop-items-on-command-give.patch b/patches/server/0006-Never-drop-items-on-command-give.patch index acadc3c2d..24092bb17 100644 --- a/patches/server/0006-Never-drop-items-on-command-give.patch +++ b/patches/server/0006-Never-drop-items-on-command-give.patch @@ -1,4 +1,4 @@ -From 0305900eab754670b6ff73fc33e127fef2d3f333 Mon Sep 17 00:00:00 2001 +From 66853489efc7f560abc8fed80a2a5b2c4c9a76ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:35:19 +0800 diff --git a/patches/server/0007-Save-json-list-async.patch b/patches/server/0007-Save-json-list-async.patch index 28e003dae..f6a5bb4e0 100644 --- a/patches/server/0007-Save-json-list-async.patch +++ b/patches/server/0007-Save-json-list-async.patch @@ -1,4 +1,4 @@ -From 5c1bd08c482b2bfe8a68be0a3d03f8a30efa2479 Mon Sep 17 00:00:00 2001 +From 874d8e5fd0cf51275fc2c5456c108df3ef508a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:16:18 +0800 diff --git a/patches/server/0008-Remove-method-profiler-callers.patch b/patches/server/0008-Remove-method-profiler-callers.patch index 9443b11f9..00252cd35 100644 --- a/patches/server/0008-Remove-method-profiler-callers.patch +++ b/patches/server/0008-Remove-method-profiler-callers.patch @@ -1,4 +1,4 @@ -From 3160d8e92b77ba43e5fac53f00b6fb9849b36bbc Mon Sep 17 00:00:00 2001 +From daeda5ae1d3f74bdcd00a362b117eac79d687d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 12:30:35 +0800 diff --git a/patches/server/0009-Disable-Snooper.patch b/patches/server/0009-Disable-Snooper.patch index 3cfb2ade1..524fa5a06 100644 --- a/patches/server/0009-Disable-Snooper.patch +++ b/patches/server/0009-Disable-Snooper.patch @@ -1,4 +1,4 @@ -From b8bc322551230b5e54fd10924c49bb751015b65e Mon Sep 17 00:00:00 2001 +From b7c8a8fe75cd50666ec9747d43b72f069c8a960d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 14:03:29 +0800 diff --git a/patches/server/0010-Server-Config.patch b/patches/server/0010-Server-Config.patch index fafaf6db8..1789a7d94 100644 --- a/patches/server/0010-Server-Config.patch +++ b/patches/server/0010-Server-Config.patch @@ -1,4 +1,4 @@ -From 9f2aeec5bd8541ba7bc53a443d0d2eedac535fa5 Mon Sep 17 00:00:00 2001 +From 32312857e072a466a2e3486e77780d296da3f5c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 3 Apr 2020 14:59:22 +0800 diff --git a/patches/server/0011-Async-pathfinder.patch b/patches/server/0011-Async-pathfinder.patch index 255f716bc..67307b4ed 100644 --- a/patches/server/0011-Async-pathfinder.patch +++ b/patches/server/0011-Async-pathfinder.patch @@ -1,4 +1,4 @@ -From edcd853ca24d50a89d96cc4d6259eb4e5fd08f89 Mon Sep 17 00:00:00 2001 +From 26f55e1ed99bdf7f3b3466ca8692dc9f11049739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Sun, 5 Apr 2020 13:01:13 +0800 diff --git a/patches/server/0012-Optimizations-for-network.patch b/patches/server/0012-Optimizations-for-network.patch index 015f0ee7f..98728775e 100644 --- a/patches/server/0012-Optimizations-for-network.patch +++ b/patches/server/0012-Optimizations-for-network.patch @@ -1,4 +1,4 @@ -From f88ab693e23833ac9d4c2e541df7752bd53a8934 Mon Sep 17 00:00:00 2001 +From 62939034baca99e0b34b46dcc899e27682410b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Sun, 5 Apr 2020 14:59:10 +0800 diff --git a/patches/server/0013-Swaps-the-predicate-order-of-collision.patch b/patches/server/0013-Swaps-the-predicate-order-of-collision.patch index b2918fc72..d299fbd1f 100644 --- a/patches/server/0013-Swaps-the-predicate-order-of-collision.patch +++ b/patches/server/0013-Swaps-the-predicate-order-of-collision.patch @@ -1,4 +1,4 @@ -From ce7b76e998e5f5ced74bdf5bffb9ceb82299e074 Mon Sep 17 00:00:00 2001 +From 027e784f714e8b63017c87ab0d20dba9ee876977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Fri, 10 Apr 2020 15:47:15 +0800 diff --git a/patches/server/0014-Akarin-Metrics.patch b/patches/server/0014-Akarin-Metrics.patch index 8920e1997..7ff2b3f8f 100644 --- a/patches/server/0014-Akarin-Metrics.patch +++ b/patches/server/0014-Akarin-Metrics.patch @@ -1,4 +1,4 @@ -From 89160747ec224cc03afc89412531a94854294347 Mon Sep 17 00:00:00 2001 +From ee39981abac8bb6439a0b0160e04aa665c319107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Mon, 13 Apr 2020 13:18:27 +0800 diff --git a/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch b/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch index 16c0515fc..54d06aa1d 100644 --- a/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch +++ b/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch @@ -1,4 +1,4 @@ -From 2dfe97b203e00b20d2ce623d7937192f4bb8a3e0 Mon Sep 17 00:00:00 2001 +From 4adc6560c02462871e25c4c57fc4321b7c405f02 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 02:39:12 +0700 Subject: [PATCH] Tuinity Use ArrayDeque for pendingChunkUpdates in diff --git a/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch index ab486e5de..34ac726ff 100644 --- a/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch +++ b/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch @@ -1,4 +1,4 @@ -From 96cfd7cd2b51c4ca8e39031fd654ec70dae16e53 Mon Sep 17 00:00:00 2001 +From d5a8762c21d7797e62f29aa891c359d173c54660 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 02:44:07 +0700 Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf diff --git a/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch index 8520b7490..516cfb69d 100644 --- a/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch @@ -1,4 +1,4 @@ -From d3184b59d0a3febbe940915a77d28b1cfcb6fd13 Mon Sep 17 00:00:00 2001 +From 022c1af5b92ba49b6b2a4ccb44860cbd16cac6f7 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 02:49:56 +0700 Subject: [PATCH] Don't run entity collision code if not needed diff --git a/patches/server/0018-Optimize-door-interact-pathfinding.patch b/patches/server/0018-Optimize-door-interact-pathfinding.patch index 6aee1b3e0..dbbf1f2c9 100644 --- a/patches/server/0018-Optimize-door-interact-pathfinding.patch +++ b/patches/server/0018-Optimize-door-interact-pathfinding.patch @@ -1,4 +1,4 @@ -From fd678f8d15018a681bb58f8be285d6a8a14e2324 Mon Sep 17 00:00:00 2001 +From 272cf8391d459597cb3d1a7af02814e6ec885588 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 03:51:50 +0700 Subject: [PATCH] Optimize door interact pathfinding diff --git a/patches/server/0019-Remove-stream-for-ender-teleport.patch b/patches/server/0019-Remove-stream-for-ender-teleport.patch new file mode 100644 index 000000000..96ce31e8c --- /dev/null +++ b/patches/server/0019-Remove-stream-for-ender-teleport.patch @@ -0,0 +1,37 @@ +From 9e9d3cfdcd213943f525a3d1a81abd7db6c38797 Mon Sep 17 00:00:00 2001 +From: Sotr +Date: Wed, 15 Apr 2020 04:16:44 +0700 +Subject: [PATCH] Remove stream for ender teleport + + +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index 3de2d40a4..c31bed6ac 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -2842,7 +2842,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke + WorldServer worldserver = (WorldServer) this.world; + + this.setPositionRotation(d0, d1, d2, this.yaw, this.pitch); +- this.cg().forEach((entity) -> { ++ this.collectPassengers().forEach((entity) -> { // Akarin - remove stream + worldserver.chunkCheck(entity); + entity.aF = true; + entity.a(Entity::teleportAndSync); +@@ -3091,6 +3091,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke + public Stream cg() { + return Stream.concat(Stream.of(this), this.passengers.stream().flatMap(Entity::cg)); + } ++ // Akarin start - non-stream version ++ public List collectPassengers() { ++ List result = Lists.newArrayList(this); ++ for (Entity passenger : this.passengers) ++ result.addAll(passenger.collectPassengers()); ++ return result; ++ } ++ // Akarin end + + public boolean hasSinglePlayerPassenger() { + Set set = Sets.newHashSet(); +-- +2.25.1.windows.1 +