From 2019524096f09c67bce09f1ed64f86ea059ad28a Mon Sep 17 00:00:00 2001 From: Mykyta Komarn Date: Mon, 5 Oct 2020 18:53:27 -0700 Subject: [PATCH] [CI-SKIP] Change Glue List patch names for licensing --- PATCHES.md | 5 ++--- ...edList.patch => 0057-Use-Glue-List-in-WeightedList.patch} | 2 +- ... => 0062-Use-Glue-List-as-delegate-for-NonNullList.patch} | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) rename patches/server/{0057-Use-GlueList-in-WeightedList.patch => 0057-Use-Glue-List-in-WeightedList.patch} (98%) rename patches/server/{0062-Use-GlueList-as-delegate-for-NonNullList.patch => 0062-Use-Glue-List-as-delegate-for-NonNullList.patch} (96%) diff --git a/PATCHES.md b/PATCHES.md index 6a5f8562..d2762247 100644 --- a/PATCHES.md +++ b/PATCHES.md @@ -115,8 +115,8 @@ # Patches | server | Stop wasting resources on JsonList#get | Ivan Pekov | | | server | Swaps the predicate order of collision | ㄗㄠˋ ㄑㄧˊ | | | server | Timings stuff | William Blake Galbreath | | -| server | Use GlueList as delegate for NonNullList | Mykyta Komarn | | -| server | Use GlueList in WeightedList | Ivan Pekov | | +| server | Use Glue List as delegate for NonNullList | Mykyta Komarn | | +| server | Use Glue List in WeightedList | Ivan Pekov | | | server | Use block distance in portal search radius | Patrick Hemmer | | | server | Use faster block collision check for entity suffocation check | Mykyta Komarn | | | server | Use offline uuids if we need to | Ivan Pekov | | @@ -135,4 +135,3 @@ # Patches | server | lithium enum_values | JellySquid | | | server | lithium-MixinChunkGeneratorAbstract | JellySquid | tr7zw | | server | lithium-MixinDataWatcher | JellySquid | tr7zw | -| server | tic-tacs Threading Fix | gegy1000 | | diff --git a/patches/server/0057-Use-GlueList-in-WeightedList.patch b/patches/server/0057-Use-Glue-List-in-WeightedList.patch similarity index 98% rename from patches/server/0057-Use-GlueList-in-WeightedList.patch rename to patches/server/0057-Use-Glue-List-in-WeightedList.patch index 39565934..dccec8e4 100644 --- a/patches/server/0057-Use-GlueList-in-WeightedList.patch +++ b/patches/server/0057-Use-Glue-List-in-WeightedList.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ivan Pekov Date: Mon, 28 Sep 2020 14:20:17 -0500 -Subject: [PATCH] Use GlueList in WeightedList +Subject: [PATCH] Use Glue List in WeightedList diff --git a/src/main/java/net/minecraft/server/WeightedList.java b/src/main/java/net/minecraft/server/WeightedList.java diff --git a/patches/server/0062-Use-GlueList-as-delegate-for-NonNullList.patch b/patches/server/0062-Use-Glue-List-as-delegate-for-NonNullList.patch similarity index 96% rename from patches/server/0062-Use-GlueList-as-delegate-for-NonNullList.patch rename to patches/server/0062-Use-Glue-List-as-delegate-for-NonNullList.patch index c1260441..918fd654 100644 --- a/patches/server/0062-Use-GlueList-as-delegate-for-NonNullList.patch +++ b/patches/server/0062-Use-Glue-List-as-delegate-for-NonNullList.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mykyta Komarn Date: Thu, 1 Oct 2020 06:52:35 -0700 -Subject: [PATCH] Use GlueList as delegate for NonNullList +Subject: [PATCH] Use Glue List as delegate for NonNullList diff --git a/src/main/java/net/minecraft/server/NonNullList.java b/src/main/java/net/minecraft/server/NonNullList.java