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

[CI-SKIP] Remove empty lines

Browse Source
This commit is contained in:
Sotr
2020-04-15 01:22:34 +07:00
parent 0aa5f300de
commit e4cdd73478
16 changed files with 18 additions and 35 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 83acb9aebbc2b9b9fddccc2d800f989d0589acfd Mon Sep 17 00:00:00 2001
From d2a5a76f2c5049f7680064c6a816827cc0b67126 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

2
patches/api/0002-Add-server-configuration.patch
View File

@@ -1,4 +1,4 @@
From b8a656f74f7c80fd1346de3cbbdef1daa26183d8 Mon Sep 17 00:00:00 2001
From fc5de7aaa87eec1126570448a02efc3966d5f992 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

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

@@ -1,4 +1,4 @@
From d7715f9ffaa67b64d95032a141287974accf0eab Mon Sep 17 00:00:00 2001
From 1ebfe4bf97bbd1709f2fafca968377d89fff64c0 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/0002-POM-Changes.patch
View File

@@ -1,4 +1,4 @@
From 14d96d1100aadeb9a247cdb4600f75d863eaf44a Mon Sep 17 00:00:00 2001
From 152babea47e6b0b47f2b4ef9c449a4d5fa5c2d77 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/0003-Brand-changes.patch
View File

@@ -1,4 +1,4 @@
From cbab8f48b6cba8c81445392a69dbc7561593e650 Mon Sep 17 00:00:00 2001
From 79d5507cb69d3dea3421cafb81391890a10f25c9 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/0004-Avoid-double-I-O-operation-on-load-player-file.patch
View File

@@ -1,4 +1,4 @@
From 2bb7d46c6cf79cef2590a825555679ef26694353 Mon Sep 17 00:00:00 2001
From 5d56a0ceb8eb374d71486d1f412db78d1c43c42f 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/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
View File

@@ -1,4 +1,4 @@
From 983eb75744babf71a6529b80b692447d23f85003 Mon Sep 17 00:00:00 2001
From 311082a5804ea3416df10b02018d353fac31c605 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/0006-Never-drop-items-on-command-give.patch
View File

@@ -1,4 +1,4 @@
From cff4fa92d8f8adfd35d60d03f53381a83c8912d7 Mon Sep 17 00:00:00 2001
From 0305900eab754670b6ff73fc33e127fef2d3f333 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/0007-Save-json-list-async.patch
View File

@@ -1,4 +1,4 @@
From 5c74def64e7cce65c796d37e22d29dccfaa1d0c8 Mon Sep 17 00:00:00 2001
From 5c1bd08c482b2bfe8a68be0a3d03f8a30efa2479 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/0008-Remove-method-profiler-callers.patch
View File

@@ -1,4 +1,4 @@
From 9f765cc4853fb01aa799b00d3b52bd1d553b130c Mon Sep 17 00:00:00 2001
From 3160d8e92b77ba43e5fac53f00b6fb9849b36bbc 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/0009-Disable-Snooper.patch
View File

@@ -1,4 +1,4 @@
From 72ce2ddfec3ddfae14baf3cff08e3182aab14cf0 Mon Sep 17 00:00:00 2001
From b8bc322551230b5e54fd10924c49bb751015b65e 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/0010-Server-Config.patch
View File

@@ -1,4 +1,4 @@
From 53b8fab5f8c74da2bf851b06e2f640a50ddbc242 Mon Sep 17 00:00:00 2001
From 9f2aeec5bd8541ba7bc53a443d0d2eedac535fa5 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/0011-Async-pathfinder.patch
View File

@@ -1,4 +1,4 @@
From 8db9311a4f338ae940053ce89c38459bf41e57b9 Mon Sep 17 00:00:00 2001
From edcd853ca24d50a89d96cc4d6259eb4e5fd08f89 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/0012-Optimizations-for-network.patch
View File

@@ -1,4 +1,4 @@
From b49fc30cedf56bdbd8e33bb2dab66567c73bf9e5 Mon Sep 17 00:00:00 2001
From f88ab693e23833ac9d4c2e541df7752bd53a8934 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

23
patches/server/0013-Swaps-the-predicate-order-of-collision.patch
View File

@@ -1,4 +1,4 @@
From 8810e6b736aeedab9000717ee0b7129dbb9fd884 Mon Sep 17 00:00:00 2001
From ce7b76e998e5f5ced74bdf5bffb9ceb82299e074 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
@@ -6,10 +6,10 @@ 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
index 34aac6031..3de2d40a4 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
@@ -1403,8 +1403,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void pickup(EntityHuman entityhuman) {}
public void collide(Entity entity) {
@@ -20,23 +20,6 @@ index 34aac6031..ff2992f90 100644
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/0014-Akarin-Metrics.patch
View File

@@ -1,4 +1,4 @@
From 76e47efddd3d5d428358a08e3730daa8c521f25c Mon Sep 17 00:00:00 2001
From 89160747ec224cc03afc89412531a94854294347 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