From 840e72091f3e9a1eccfd9baed07ff0fb45b53686 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 30 Apr 2021 10:17:21 -0400 Subject: [PATCH] [CI-SKIP] [Auto] Rebuild Patches A recent commit has been made that caused patches to be out of order, rebuilding --- ...s.patch => 0292-PlayerMoveEvent-Improvements.patch} | 0 ... 0293-add-RespawnFlags-to-PlayerRespawnEvent.patch} | 0 ...roduce-beacon-activation-deactivation-events.patch} | 10 +++++----- ...=> 0720-Add-Channel-initialization-listeners.patch} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename Spigot-API-Patches/{0291-PlayerMoveEvent-Improvements.patch => 0292-PlayerMoveEvent-Improvements.patch} (100%) rename Spigot-API-Patches/{0292-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0293-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%) rename Spigot-Server-Patches/{0718-Introduce-beacon-activation-deactivation-events.patch => 0719-Introduce-beacon-activation-deactivation-events.patch} (88%) rename Spigot-Server-Patches/{0719-Add-Channel-initialization-listeners.patch => 0720-Add-Channel-initialization-listeners.patch} (100%) diff --git a/Spigot-API-Patches/0291-PlayerMoveEvent-Improvements.patch b/Spigot-API-Patches/0292-PlayerMoveEvent-Improvements.patch similarity index 100% rename from Spigot-API-Patches/0291-PlayerMoveEvent-Improvements.patch rename to Spigot-API-Patches/0292-PlayerMoveEvent-Improvements.patch diff --git a/Spigot-API-Patches/0292-add-RespawnFlags-to-PlayerRespawnEvent.patch b/Spigot-API-Patches/0293-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from Spigot-API-Patches/0292-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to Spigot-API-Patches/0293-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/Spigot-Server-Patches/0718-Introduce-beacon-activation-deactivation-events.patch b/Spigot-Server-Patches/0719-Introduce-beacon-activation-deactivation-events.patch similarity index 88% rename from Spigot-Server-Patches/0718-Introduce-beacon-activation-deactivation-events.patch rename to Spigot-Server-Patches/0719-Introduce-beacon-activation-deactivation-events.patch index d765b73ca..4b084a47e 100644 --- a/Spigot-Server-Patches/0718-Introduce-beacon-activation-deactivation-events.patch +++ b/Spigot-Server-Patches/0719-Introduce-beacon-activation-deactivation-events.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Introduce beacon activation/deactivation events diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java -index 8dfb9eb12d07c2d4737ecf3de1ae7f6de31891bf..732398fb0ae6427c776d8a56aed9afd4a5b70e30 100644 +index 8dfb9eb12d07c2d4737ecf3de1ae7f6de31891bf..fb2e914599ce024fa151735e8c2ac2eb6bdf05e7 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java -@@ -46,6 +47,8 @@ import org.bukkit.potion.PotionEffect; +@@ -46,6 +46,8 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.entity.Player; import com.destroystokyo.paper.event.block.BeaconEffectEvent; @@ -17,7 +17,7 @@ index 8dfb9eb12d07c2d4737ecf3de1ae7f6de31891bf..732398fb0ae6427c776d8a56aed9afd4 // Paper end public class TileEntityBeacon extends TileEntity implements ITileInventory, ITickable { -@@ -211,6 +214,10 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic +@@ -211,6 +213,10 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic boolean flag1 = this.levels > 0; if (!flag && flag1) { @@ -28,7 +28,7 @@ index 8dfb9eb12d07c2d4737ecf3de1ae7f6de31891bf..732398fb0ae6427c776d8a56aed9afd4 this.a(SoundEffects.BLOCK_BEACON_ACTIVATE); Iterator iterator = this.world.a(EntityPlayer.class, (new AxisAlignedBB((double) i, (double) j, (double) k, (double) i, (double) (j - 4), (double) k)).grow(10.0D, 5.0D, 10.0D)).iterator(); -@@ -220,6 +227,10 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic +@@ -220,6 +226,10 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic CriterionTriggers.l.a(entityplayer, this); } } else if (flag && !flag1) { @@ -39,7 +39,7 @@ index 8dfb9eb12d07c2d4737ecf3de1ae7f6de31891bf..732398fb0ae6427c776d8a56aed9afd4 this.a(SoundEffects.BLOCK_BEACON_DEACTIVATE); } } -@@ -257,6 +268,10 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic +@@ -257,6 +267,10 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic @Override public void al_() { diff --git a/Spigot-Server-Patches/0719-Add-Channel-initialization-listeners.patch b/Spigot-Server-Patches/0720-Add-Channel-initialization-listeners.patch similarity index 100% rename from Spigot-Server-Patches/0719-Add-Channel-initialization-listeners.patch rename to Spigot-Server-Patches/0720-Add-Channel-initialization-listeners.patch