diff --git a/LICENSE.md b/LICENSE.md index 704c1863a1..687fd815fe 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -43,7 +43,7 @@ ysl3000 Machine_Maker Ivan Pekov Camotoy <20743703+Camotoy@users.noreply.github.com> -Bjarne Koll +Bjarne Koll MeFisto94 Owen1212055 <23108066+Owen1212055@users.noreply.github.com> LemonCaramel diff --git a/patches/api/0112-Expand-Explosions-API.patch b/patches/api/0112-Expand-Explosions-API.patch index 42f8422bee..bc6d875f8f 100644 --- a/patches/api/0112-Expand-Explosions-API.patch +++ b/patches/api/0112-Expand-Explosions-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. Co-authored-by: Esoteric Enderman <90862990+EsotericEnderman@users.noreply.github.com> -Co-authored-by: Bjarne Koll +Co-authored-by: Bjarne Koll diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java index df88bc77a3fa2506adf17eddc6300ac65774df6f..fe2e0939df61b1f59d12adf3f760f1d619bb3de3 100644 diff --git a/patches/api/0472-Introduce-registry-entry-and-builders.patch b/patches/api/0472-Introduce-registry-entry-and-builders.patch index 56e6efc80a..0a25fd735e 100644 --- a/patches/api/0472-Introduce-registry-entry-and-builders.patch +++ b/patches/api/0472-Introduce-registry-entry-and-builders.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll +From: Bjarne Koll Date: Thu, 13 Jun 2024 22:35:05 +0200 Subject: [PATCH] Introduce registry entry and builders diff --git a/patches/api/0496-Fix-incorrect-invulnerability-damage-reduction.patch b/patches/api/0496-Fix-incorrect-invulnerability-damage-reduction.patch index 81c85455cd..6acc214667 100644 --- a/patches/api/0496-Fix-incorrect-invulnerability-damage-reduction.patch +++ b/patches/api/0496-Fix-incorrect-invulnerability-damage-reduction.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll -Date: Mon, 28 Oct 2024 15:58:50 +0100 +From: Bjarne Koll +Date: Mon, 11 Nov 2024 21:35:22 +0100 Subject: [PATCH] Fix incorrect invulnerability damage reduction Fixes incorrect spigot handling of the invulnerability damage diff --git a/patches/server/0202-Expand-Explosions-API.patch b/patches/server/0202-Expand-Explosions-API.patch index 4c63639fb5..ff7845689a 100644 --- a/patches/server/0202-Expand-Explosions-API.patch +++ b/patches/server/0202-Expand-Explosions-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. Co-authored-by: Esoteric Enderman <90862990+EsotericEnderman@users.noreply.github.com> -Co-authored-by: Bjarne Koll +Co-authored-by: Bjarne Koll diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java index 0c0d19708832a49734ea08ae05696e0cb20616e4..3324156c004e0506df8be23050f497d462b4b9c1 100644 diff --git a/patches/server/0608-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0608-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch index c313451894..f5c3a81df3 100644 --- a/patches/server/0608-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch +++ b/patches/server/0608-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll +From: Bjarne Koll Date: Sat, 6 Nov 2021 23:15:20 +0100 Subject: [PATCH] Fix setPatternColor on tropical fish bucket meta diff --git a/patches/server/0782-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0782-Correctly-shrink-items-during-EntityResurrectEvent.patch index 427a668981..acfb8fe4de 100644 --- a/patches/server/0782-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/server/0782-Correctly-shrink-items-during-EntityResurrectEvent.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll +From: Bjarne Koll Date: Tue, 10 Jan 2023 21:06:42 +0100 Subject: [PATCH] Correctly shrink items during EntityResurrectEvent diff --git a/patches/server/0836-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0836-Only-erase-allay-memory-on-non-item-targets.patch index b26cfd040b..581af491b6 100644 --- a/patches/server/0836-Only-erase-allay-memory-on-non-item-targets.patch +++ b/patches/server/0836-Only-erase-allay-memory-on-non-item-targets.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll +From: Bjarne Koll Date: Fri, 4 Aug 2023 15:53:36 +0200 Subject: [PATCH] Only erase allay memory on non-item targets diff --git a/patches/server/0966-Adopt-MaterialRerouting.patch b/patches/server/0966-Adopt-MaterialRerouting.patch index 648057e1dd..e66973fb9d 100644 --- a/patches/server/0966-Adopt-MaterialRerouting.patch +++ b/patches/server/0966-Adopt-MaterialRerouting.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll +From: Bjarne Koll Date: Thu, 13 Jun 2024 11:02:36 +0200 Subject: [PATCH] Adopt MaterialRerouting diff --git a/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch index a161fd71b6..2defd5b72f 100644 --- a/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch +++ b/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll +From: Bjarne Koll Date: Thu, 13 Jun 2024 17:16:01 +0200 Subject: [PATCH] Configurable damage tick when blocking with shield diff --git a/patches/server/0986-Remove-streams-from-hot-code.patch b/patches/server/0986-Remove-streams-from-hot-code.patch index bab16c74ad..f1585163e2 100644 --- a/patches/server/0986-Remove-streams-from-hot-code.patch +++ b/patches/server/0986-Remove-streams-from-hot-code.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove streams from hot code Feature patch -Co-authored-by: Bjarne Koll +Co-authored-by: Bjarne Koll Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java diff --git a/patches/server/0994-Add-registry-entry-and-builders.patch b/patches/server/0994-Add-registry-entry-and-builders.patch index be3eccb69a..37f4a6a8c0 100644 --- a/patches/server/0994-Add-registry-entry-and-builders.patch +++ b/patches/server/0994-Add-registry-entry-and-builders.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll +From: Bjarne Koll Date: Thu, 13 Jun 2024 23:45:32 +0200 Subject: [PATCH] Add registry entry and builders diff --git a/patches/server/1001-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/1001-Only-call-EntityDamageEvents-before-actuallyHurt.patch index df30fe3fdd..69eb7730e6 100644 --- a/patches/server/1001-Only-call-EntityDamageEvents-before-actuallyHurt.patch +++ b/patches/server/1001-Only-call-EntityDamageEvents-before-actuallyHurt.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll +From: Bjarne Koll Date: Mon, 8 Jul 2024 22:01:08 +0200 Subject: [PATCH] Only call EntityDamageEvents before actuallyHurt diff --git a/patches/server/1024-Remove-wall-time-unused-skip-tick-protection.patch b/patches/server/1024-Remove-wall-time-unused-skip-tick-protection.patch index deaf422ec7..c25e6680dc 100644 --- a/patches/server/1024-Remove-wall-time-unused-skip-tick-protection.patch +++ b/patches/server/1024-Remove-wall-time-unused-skip-tick-protection.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll +From: Bjarne Koll Date: Mon, 16 Sep 2024 23:07:29 +0200 Subject: [PATCH] Remove wall-time / unused skip tick protection diff --git a/patches/server/1059-Correct-update-cursor.patch b/patches/server/1059-Correct-update-cursor.patch index 9d4e655ebb..77c0c52550 100644 --- a/patches/server/1059-Correct-update-cursor.patch +++ b/patches/server/1059-Correct-update-cursor.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll +From: Bjarne Koll Date: Fri, 1 Nov 2024 14:58:57 +0100 Subject: [PATCH] Correct update cursor diff --git a/patches/server/1065-Fix-incorrect-invulnerability-damage-reduction.patch b/patches/server/1065-Fix-incorrect-invulnerability-damage-reduction.patch index 06168ad635..2f4b196852 100644 --- a/patches/server/1065-Fix-incorrect-invulnerability-damage-reduction.patch +++ b/patches/server/1065-Fix-incorrect-invulnerability-damage-reduction.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll -Date: Mon, 28 Oct 2024 15:59:44 +0100 +From: Bjarne Koll +Date: Mon, 11 Nov 2024 21:35:27 +0100 Subject: [PATCH] Fix incorrect invulnerability damage reduction Fixes incorrect spigot handling of the invulnerability damage