diff --git a/patches/api/0001-POM-Changes.patch b/patches/api/0001-POM-Changes.patch index 5242d85c9..8818691d6 100644 --- a/patches/api/0001-POM-Changes.patch +++ b/patches/api/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 5164a9653a05ff9d79c10ed60825a616f174885d Mon Sep 17 00:00:00 2001 +From ea56d355a2d1a13c19a8f90d3dfe070da5453928 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-Server-Config.patch b/patches/api/0002-Server-Config.patch index 0bc50062a..bb9ce247e 100644 --- a/patches/api/0002-Server-Config.patch +++ b/patches/api/0002-Server-Config.patch @@ -1,4 +1,4 @@ -From 8ccacdb4c8de5ae9a3ae3132375149688878f3ea Mon Sep 17 00:00:00 2001 +From f7988e4df29e9aa815246aa2a5196d0edf1421be 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-POM-Changes.patch b/patches/server/0001-POM-Changes.patch index ff56d9ac6..4181b1806 100644 --- a/patches/server/0001-POM-Changes.patch +++ b/patches/server/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 1a3f35fc04d57551d3e2577b1fa5c12225f996b9 Mon Sep 17 00:00:00 2001 +From b22a8255f9347e76364a8bac898656c182c6700d 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/0002-Brand-changes.patch b/patches/server/0002-Brand-changes.patch index ae635dab0..31de84767 100644 --- a/patches/server/0002-Brand-changes.patch +++ b/patches/server/0002-Brand-changes.patch @@ -1,4 +1,4 @@ -From 456a8f61c85faeb41f873a8211651064471b2109 Mon Sep 17 00:00:00 2001 +From 8449e40c0c366b522ba608c519d11d0696a60d29 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/0003-Avoid-double-I-O-operation-on-load-player-file.patch b/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch index 29a4d92fa..f4f1dece0 100644 --- a/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch +++ b/patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch @@ -1,4 +1,4 @@ -From 74d31cd6b32b770b43f2c63338b2d6a26c8fbb3c Mon Sep 17 00:00:00 2001 +From 67b400d122d8fb2714ad64d346e14053099103df 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/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch b/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch index 9f9fa14f6..f84d48a00 100644 --- a/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch +++ b/patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch @@ -1,4 +1,4 @@ -From 65f6aacd03bc7cc2d25ae740ae56c6f8d40e2562 Mon Sep 17 00:00:00 2001 +From a1681dcedfd767bd10ee3bb76a12c6fd93bc85b2 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/0005-Never-drop-items-on-command-give.patch b/patches/server/0005-Never-drop-items-on-command-give.patch index a72332936..21ebf8d8b 100644 --- a/patches/server/0005-Never-drop-items-on-command-give.patch +++ b/patches/server/0005-Never-drop-items-on-command-give.patch @@ -1,4 +1,4 @@ -From 0406f79f227b3dde70fc3b30d197d2ba9e51bf3f Mon Sep 17 00:00:00 2001 +From 2a0476b1809e9f847c80ac8b97be008539aef675 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/0006-Save-json-list-async.patch b/patches/server/0006-Save-json-list-async.patch index 8529c25c9..bafefc9fa 100644 --- a/patches/server/0006-Save-json-list-async.patch +++ b/patches/server/0006-Save-json-list-async.patch @@ -1,4 +1,4 @@ -From 02beac4a905ffda03bb2efb06d02b91c784364c1 Mon Sep 17 00:00:00 2001 +From b3a63a4b6ae248c7f40f9fa16d31c869e46a7e39 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/0007-Remove-method-profiler-callers.patch b/patches/server/0007-Remove-method-profiler-callers.patch index d72f53448..91d20962c 100644 --- a/patches/server/0007-Remove-method-profiler-callers.patch +++ b/patches/server/0007-Remove-method-profiler-callers.patch @@ -1,4 +1,4 @@ -From 59e944b32e5353a4e945beffe859c95e9fa9bbb2 Mon Sep 17 00:00:00 2001 +From 4a7e860ba9020d8912e4fc00422cc049c1760f9f 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/0008-Disable-Snooper.patch b/patches/server/0008-Disable-Snooper.patch index 1a85c54ae..c46083234 100644 --- a/patches/server/0008-Disable-Snooper.patch +++ b/patches/server/0008-Disable-Snooper.patch @@ -1,4 +1,4 @@ -From 809f59a025b5cf347b5700c693819cef18b32c2b Mon Sep 17 00:00:00 2001 +From e3479bcf0acf0b69178c1b2383471e7403a28aaa 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/0009-Server-Config.patch b/patches/server/0009-Server-Config.patch index 621915480..ffffaa5bf 100644 --- a/patches/server/0009-Server-Config.patch +++ b/patches/server/0009-Server-Config.patch @@ -1,4 +1,4 @@ -From b984fef56747270b30953faf9d55ae86e61157a1 Mon Sep 17 00:00:00 2001 +From df31eb7029b1f4375efd345ae8b0ccc6c66f3437 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/0010-Async-pathfinder.patch b/patches/server/0010-Async-pathfinder.patch index da95e0d16..687622451 100644 --- a/patches/server/0010-Async-pathfinder.patch +++ b/patches/server/0010-Async-pathfinder.patch @@ -1,4 +1,4 @@ -From 99ba10d891b0357bc2d7ae7ee9ee8ecc6a362812 Mon Sep 17 00:00:00 2001 +From f3b58f561f37417a17ed2dd7827fcbbfbba995d7 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/0011-Optimizations-for-network.patch b/patches/server/0011-Optimizations-for-network.patch index f186c32c5..056fcf5dd 100644 --- a/patches/server/0011-Optimizations-for-network.patch +++ b/patches/server/0011-Optimizations-for-network.patch @@ -1,4 +1,4 @@ -From 0052685f681e2e326d5374c01e4ad097979f8707 Mon Sep 17 00:00:00 2001 +From 72d6a736a2467fa9b6b155fea71fa426ab4a227b 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/0012-Swaps-the-predicate-order-of-collision.patch b/patches/server/0012-Swaps-the-predicate-order-of-collision.patch index eabf794d3..5bd035b13 100644 --- a/patches/server/0012-Swaps-the-predicate-order-of-collision.patch +++ b/patches/server/0012-Swaps-the-predicate-order-of-collision.patch @@ -1,4 +1,4 @@ -From 289ac1a22489e624cd0766e6a1414c92a8afe120 Mon Sep 17 00:00:00 2001 +From 5b7af710836342c5528e770fea35e2e873399f59 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/0013-Akarin-Metrics.patch b/patches/server/0013-Akarin-Metrics.patch index 9f6bc9a64..9d661d2c6 100644 --- a/patches/server/0013-Akarin-Metrics.patch +++ b/patches/server/0013-Akarin-Metrics.patch @@ -1,4 +1,4 @@ -From 41e534adf59d6772d86194362a40aa935659d350 Mon Sep 17 00:00:00 2001 +From c9cb85c01ba2475b7513d83e7368388c7c2e0369 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/0014-Fix-errors-on-eclipse.patch b/patches/server/0014-Fix-errors-on-eclipse.patch new file mode 100644 index 000000000..0fb2391fd --- /dev/null +++ b/patches/server/0014-Fix-errors-on-eclipse.patch @@ -0,0 +1,51 @@ +From 671b229cf0b6895fb2b8e798bb05e4d8692e8763 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/.gitignore b/.gitignore +index 67fb370ca..9b8966343 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -2,6 +2,7 @@ + /.classpath + /.project + /.settings ++/.factorypath + + # netbeans + /nbproject +diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java +index 9ebd7ecb7..677ccffd0 100644 +--- a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java ++++ b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java +@@ -76,7 +76,7 @@ public final class PlayerMobDistanceMap { + final int centerX = currPosition.getX(); + final int centerZ = currPosition.getZ(); + +- for (final Long2ObjectLinkedOpenHashMap.Entry> entry : this.playerMap.long2ObjectEntrySet()) { ++ for (final it.unimi.dsi.fastutil.longs.Long2ObjectMap.Entry> entry : this.playerMap.long2ObjectEntrySet()) { // Akarin - fix errors on eclipse + final long key = entry.getLongKey(); + final PooledHashSets.PooledObjectLinkedOpenHashSet map = entry.getValue(); + +diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java +index f625da9f0..3f128565b 100644 +--- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java ++++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java +@@ -134,10 +134,10 @@ public abstract class AreaMap { + final int centerX = MCUtil.getCoordinateX(currPosition); + final int centerZ = MCUtil.getCoordinateZ(currPosition); + +- for (Iterator>> iterator = this.areaMap.long2ObjectEntrySet().fastIterator(); ++ for (Iterator>> iterator = this.areaMap.long2ObjectEntrySet().fastIterator(); // Akarin - fix errors on eclipse + iterator.hasNext();) { + +- final Long2ObjectLinkedOpenHashMap.Entry> entry = iterator.next(); ++ final it.unimi.dsi.fastutil.longs.Long2ObjectMap.Entry> entry = iterator.next(); // Akarin - fix errors on eclipse + final long key = entry.getLongKey(); + final PooledLinkedHashSets.PooledObjectLinkedOpenHashSet map = entry.getValue(); + +-- +2.25.1.windows.1 + diff --git a/pom.xml b/pom.xml index 1faf938f1..ad359b820 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,41 @@ install ${project.artifactId} + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + com.lukegb.mojo + + + gitdescribe-maven-plugin + + + [1.3,) + + + gitdescribe + + + + + + + + + + + + Akarin-API