Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Save more lines & fix patch order

Browse Source
This commit is contained in:
Sotr
2020-04-15 00:59:14 +07:00
parent f5c5fa32bf
commit 9b12bb9099
17 changed files with 65 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/api/0001-POM-Changes.patch
View File

@@ -1,4 +1,4 @@
From ea56d355a2d1a13c19a8f90d3dfe070da5453928 Mon Sep 17 00:00:00 2001
From 46813a3211645b1e0d45fafe9873fd4734fe19fb 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 14 Dec 2018 21:52:29 -0800

20
patches/api/0002-Server-Config.patch → patches/api/0002-Add-server-configuration.patch
View File

@@ -1,39 +1,37 @@
From f7988e4df29e9aa815246aa2a5196d0edf1421be Mon Sep 17 00:00:00 2001
From e7955146fde4178be3e911e34de5c88d8a88b084 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 3 Apr 2020 15:18:38 +0800
Subject: [PATCH] Server Config
Subject: [PATCH] Add server configuration
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 93d5a3f97..08e428bd3 100644
index 93d5a3f97..dfb57b9db 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -206,7 +206,8 @@ class TimingsExport extends Thread {
parent.put("config", createObject(
@@ -207,6 +207,7 @@ class TimingsExport extends Thread {
pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
+ pair("akarin", mapAsJSON(Bukkit.spigot().getAkarinConfig(), null)) // Akarin - Server Config
pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
+ , pair("akarin", mapAsJSON(Bukkit.spigot().getAkarinConfig(), null)) // Akarin - Server config
));
new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9ceaac0e8..7444b4159 100644
index 9ceaac0e8..17a494b4d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1386,6 +1386,14 @@ public interface Server extends PluginMessageRecipient {
}
// Paper end
+ // Akarin Start - Server Config
+ // Akarin start - Server config
+ @NotNull
+ public org.bukkit.configuration.file.YamlConfiguration getAkarinConfig()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ // Akarin End - Server Config
+ // Akarin end - Server config
+
/**
* Sends the component to the player

2
patches/server/0014-Fix-errors-on-eclipse.patch → patches/server/0001-Fix-errors-on-eclipse.patch
View File

@@ -1,4 +1,4 @@
From 671b229cf0b6895fb2b8e798bb05e4d8692e8763 Mon Sep 17 00:00:00 2001
From d415afe71bbee1b4f27ddbdea90cff9a45720f1b Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 00:52:56 +0700
Subject: [PATCH] Fix errors on eclipse

2
patches/server/0001-POM-Changes.patch → patches/server/0002-POM-Changes.patch
View File

@@ -1,4 +1,4 @@
From b22a8255f9347e76364a8bac898656c182c6700d Mon Sep 17 00:00:00 2001
From 6505e63a1dd8c36e20e2fdada4245ae7231d2885 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 14 Dec 2018 21:53:58 -0800

2
patches/server/0002-Brand-changes.patch → patches/server/0003-Brand-changes.patch
View File

@@ -1,4 +1,4 @@
From 8449e40c0c366b522ba608c519d11d0696a60d29 Mon Sep 17 00:00:00 2001
From b10fb5facb5e0ebec310d2c2628d3ec4492c6666 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?=
<tsao-chi@the-lingo.org>
Date: Tue, 18 Dec 2018 06:27:02 -0800

2
patches/server/0003-Avoid-double-I-O-operation-on-load-player-file.patch → patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch
View File

@@ -1,4 +1,4 @@
From 67b400d122d8fb2714ad64d346e14053099103df Mon Sep 17 00:00:00 2001
From 0e80d66be9eb5eb497077d92cd63598c1269fa88 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:29:08 +0800

2
patches/server/0004-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch → patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
View File

@@ -1,4 +1,4 @@
From a1681dcedfd767bd10ee3bb76a12c6fd93bc85b2 Mon Sep 17 00:00:00 2001
From 70c6cc1222276022d3f876996fbcbf27039446e5 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:43:20 +0800

2
patches/server/0005-Never-drop-items-on-command-give.patch → patches/server/0006-Never-drop-items-on-command-give.patch
View File

@@ -1,4 +1,4 @@
From 2a0476b1809e9f847c80ac8b97be008539aef675 Mon Sep 17 00:00:00 2001
From e8f51063170fc9aaea039471bfdbe35002ebc176 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:35:19 +0800

2
patches/server/0006-Save-json-list-async.patch → patches/server/0007-Save-json-list-async.patch
View File

@@ -1,4 +1,4 @@
From b3a63a4b6ae248c7f40f9fa16d31c869e46a7e39 Mon Sep 17 00:00:00 2001
From 3cc85adff0a6056fbd342fabadd3c5e945129790 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 11:16:18 +0800

2
patches/server/0007-Remove-method-profiler-callers.patch → patches/server/0008-Remove-method-profiler-callers.patch
View File

@@ -1,4 +1,4 @@
From 4a7e860ba9020d8912e4fc00422cc049c1760f9f Mon Sep 17 00:00:00 2001
From 6cd000fd4ced15437c97d5f1d212bdb2565613ee 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 12:30:35 +0800

2
patches/server/0008-Disable-Snooper.patch → patches/server/0009-Disable-Snooper.patch
View File

@@ -1,4 +1,4 @@
From e3479bcf0acf0b69178c1b2383471e7403a28aaa Mon Sep 17 00:00:00 2001
From 693f92d7b6ebc594957ef1ed53b5fec234e39c81 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?=
<tsao-chi@the-lingo.org>
Date: Thu, 2 Apr 2020 14:03:29 +0800

2
patches/server/0009-Server-Config.patch → patches/server/0010-Server-Config.patch
View File

@@ -1,4 +1,4 @@
From df31eb7029b1f4375efd345ae8b0ccc6c66f3437 Mon Sep 17 00:00:00 2001
From caf17d99e911fd03ebd8a1cbad0d1a4759c38446 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 3 Apr 2020 14:59:22 +0800

2
patches/server/0010-Async-pathfinder.patch → patches/server/0011-Async-pathfinder.patch
View File

@@ -1,4 +1,4 @@
From f3b58f561f37417a17ed2dd7827fcbbfbba995d7 Mon Sep 17 00:00:00 2001
From d742d2b7a9d31873118ed08b087af380727882c5 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?=
<tsao-chi@the-lingo.org>
Date: Sun, 5 Apr 2020 13:01:13 +0800

2
patches/server/0011-Optimizations-for-network.patch → patches/server/0012-Optimizations-for-network.patch
View File

@@ -1,4 +1,4 @@
From 72d6a736a2467fa9b6b155fea71fa426ab4a227b Mon Sep 17 00:00:00 2001
From b87681ff25f78e147959f1b7dfe78ce072cc3a57 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?=
<tsao-chi@the-lingo.org>
Date: Sun, 5 Apr 2020 14:59:10 +0800

81
patches/server/0012-Swaps-the-predicate-order-of-collision.patch
View File

@@ -1,81 +0,0 @@
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?=
<tsao-chi@the-lingo.org>
Date: Fri, 10 Apr 2020 15:47:15 +0800
Subject: [PATCH] Swaps the predicate order of collision
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 34aac6031..a4467199c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1403,38 +1403,38 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void pickup(EntityHuman entityhuman) {}
public void collide(Entity entity) {
- if (!this.isSameVehicle(entity)) {
- if (!entity.noclip && !this.noclip) {
- double d0 = entity.locX() - this.locX();
- double d1 = entity.locZ() - this.locZ();
- double d2 = MathHelper.a(d0, d1);
-
- if (d2 >= 0.009999999776482582D) {
- d2 = (double) MathHelper.sqrt(d2);
- d0 /= d2;
- d1 /= d2;
- double d3 = 1.0D / d2;
-
- if (d3 > 1.0D) {
- d3 = 1.0D;
- }
-
- d0 *= d3;
- d1 *= d3;
- d0 *= 0.05000000074505806D;
- d1 *= 0.05000000074505806D;
- d0 *= (double) (1.0F - this.J);
- d1 *= (double) (1.0F - this.J);
- if (!this.isVehicle()) {
- this.h(-d0, 0.0D, -d1);
- }
+ if (!entity.noclip && !this.noclip && !this.isSameVehicle(entity)) { // Akarin - Swaps the predicate order of collision
+ //if (!entity.noclip && !this.noclip) { // Akarin - Swaps the predicate order of collision
+ double d0 = entity.locX() - this.locX();
+ double d1 = entity.locZ() - this.locZ();
+ double d2 = MathHelper.a(d0, d1);
+
+ if (d2 >= 0.009999999776482582D) {
+ d2 = (double) MathHelper.sqrt(d2);
+ d0 /= d2;
+ d1 /= d2;
+ double d3 = 1.0D / d2;
+
+ if (d3 > 1.0D) {
+ d3 = 1.0D;
+ }
- if (!entity.isVehicle()) {
- entity.h(d0, 0.0D, d1);
- }
+ d0 *= d3;
+ d1 *= d3;
+ d0 *= 0.05000000074505806D;
+ d1 *= 0.05000000074505806D;
+ d0 *= (double) (1.0F - this.J);
+ d1 *= (double) (1.0F - this.J);
+ if (!this.isVehicle()) {
+ this.h(-d0, 0.0D, -d1);
}
+ if (!entity.isVehicle()) {
+ entity.h(d0, 0.0D, d1);
+ }
}
+
+ //} // Akarin - Swaps the predicate order of collision
}
}
--
2.25.1.windows.1

42
patches/server/0013-Swaps-the-predicate-order-of-collision.patch Normal file
View File

@@ -0,0 +1,42 @@
From f97c63ba1cce2deb50603da45ef23bf075c5955a 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 10 Apr 2020 15:47:15 +0800
Subject: [PATCH] Swaps the predicate order of collision
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 34aac6031..ff2992f90 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1403,22 +1403,23 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void pickup(EntityHuman entityhuman) {}
public void collide(Entity entity) {
+ if (entity.noclip || this.noclip) return; // Akarin - Test this earlier
if (!this.isSameVehicle(entity)) {
- if (!entity.noclip && !this.noclip) {
+ if (true || !entity.noclip && !this.noclip) { // Akarin - Moved up
double d0 = entity.locX() - this.locX();
double d1 = entity.locZ() - this.locZ();
double d2 = MathHelper.a(d0, d1);
-
+
if (d2 >= 0.009999999776482582D) {
d2 = (double) MathHelper.sqrt(d2);
d0 /= d2;
d1 /= d2;
double d3 = 1.0D / d2;
-
+
if (d3 > 1.0D) {
d3 = 1.0D;
}
-
+
d0 *= d3;
d1 *= d3;
d0 *= 0.05000000074505806D;
--
2.25.1.windows.1

2
patches/server/0013-Akarin-Metrics.patch → patches/server/0014-Akarin-Metrics.patch
View File

@@ -1,4 +1,4 @@
From c9cb85c01ba2475b7513d83e7368388c7c2e0369 Mon Sep 17 00:00:00 2001
From e074f82473d0b535c63725fc45bd9f76c5a3bc94 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?=
<tsao-chi@the-lingo.org>
Date: Mon, 13 Apr 2020 13:18:27 +0800