From f75636b55fa3c0a29c91931f6c44db2da7d1cefb Mon Sep 17 00:00:00 2001 From: Maddy Miller Date: Mon, 20 Sep 2021 19:30:04 +1000 Subject: [PATCH] [ci skip] Update my name in author field (#6625) --- ...249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch | 2 +- ...Add-API-to-get-exact-interaction-point-in-PlayerInte.patch | 2 +- patches/api/0263-Add-BlockPreDispenseEvent.patch | 2 +- ...Implement-API-to-get-Material-from-Boats-and-Minecar.patch | 2 +- ...0595-Implement-API-to-expose-exact-interaction-point.patch | 4 ++-- patches/server/0605-Implement-BlockPreDispenseEvent.patch | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch index d6cdb8862b..839f32ab71 100644 --- a/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch +++ b/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matthew Miller +From: Madeline Miller Date: Thu, 31 Dec 2020 12:48:38 +1000 Subject: [PATCH] Add API to get Material from Boats and Minecarts diff --git a/patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch index 197d00ca14..afc3f45d28 100644 --- a/patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch +++ b/patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matthew Miller +From: Madeline Miller Date: Mon, 4 Jan 2021 16:40:55 +1000 Subject: [PATCH] Add API to get exact interaction point in PlayerInteractEvent diff --git a/patches/api/0263-Add-BlockPreDispenseEvent.patch b/patches/api/0263-Add-BlockPreDispenseEvent.patch index 5850391175..fb0b89a4ee 100644 --- a/patches/api/0263-Add-BlockPreDispenseEvent.patch +++ b/patches/api/0263-Add-BlockPreDispenseEvent.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matthew Miller +From: Madeline Miller Date: Sun, 17 Jan 2021 13:15:54 +1000 Subject: [PATCH] Add BlockPreDispenseEvent diff --git a/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch index fffb32a201..756fb6afc4 100644 --- a/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch +++ b/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matthew Miller +From: Madeline Miller Date: Thu, 31 Dec 2020 12:48:19 +1000 Subject: [PATCH] Implement API to get Material from Boats and Minecarts diff --git a/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch index 373ddafceb..2d134babc9 100644 --- a/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch +++ b/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matthew Miller +From: Madeline Miller Date: Mon, 4 Jan 2021 16:40:27 +1000 Subject: [PATCH] Implement API to expose exact interaction point @@ -18,7 +18,7 @@ index 0b274a5b9e0bf68769637f10e43dbff6d909512b..da2ae74b6f5875200e22c42ed0743101 this.interactResult = event.useItemInHand() == Event.Result.DENY; this.interactPosition = blockposition.immutable(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 133a4a00d74a719881bca47d9d5efc850c7fa4bf..18f929e0adf011671ad0dec2e7dedbc88bcd667e 100644 +index 08edd5d673e3dab3aec7d6e775e0c24942bba3ee..64a3d7a44a208e966411a006c7a2d1c5d349df95 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -56,7 +56,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; diff --git a/patches/server/0605-Implement-BlockPreDispenseEvent.patch b/patches/server/0605-Implement-BlockPreDispenseEvent.patch index 8aaa20c2e9..6955a911bc 100644 --- a/patches/server/0605-Implement-BlockPreDispenseEvent.patch +++ b/patches/server/0605-Implement-BlockPreDispenseEvent.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matthew Miller +From: Madeline Miller Date: Sun, 17 Jan 2021 13:16:09 +1000 Subject: [PATCH] Implement BlockPreDispenseEvent @@ -17,7 +17,7 @@ index 501a5483160dba050261bb3448317a097cdb7ef2..2dcac4b638073aa1748f26f61219dbf9 tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack)); } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 18f929e0adf011671ad0dec2e7dedbc88bcd667e..b3d218a1a1bd52dfe00062ef82779cf81157e74b 100644 +index 64a3d7a44a208e966411a006c7a2d1c5d349df95..5722f246843cd9094524462346889b04c8ad6d89 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1847,5 +1847,11 @@ public class CraftEventFactory {