OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

[CI-SKIP] [Auto] Rebuild Patches

Browse source 
A recent commit has been made that caused patches to be out of order, rebuilding
This commit is contained in:
Aikar 2021-04-30 10:17:21 -04:00
parent a33232d4a6
commit 840e72091f
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
Spigot-API-Patches/0291-PlayerMoveEvent-Improvements.patch → Spigot-API-Patches/0292-PlayerMoveEvent-Improvements.patch
View file

0
Spigot-API-Patches/0292-add-RespawnFlags-to-PlayerRespawnEvent.patch → Spigot-API-Patches/0293-add-RespawnFlags-to-PlayerRespawnEvent.patch
View file

10
Spigot-Server-Patches/0718-Introduce-beacon-activation-deactivation-events.patch → Spigot-Server-Patches/0719-Introduce-beacon-activation-deactivation-events.patch
View file

@ -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_() {

0
Spigot-Server-Patches/0719-Add-Channel-initialization-listeners.patch → Spigot-Server-Patches/0720-Add-Channel-initialization-listeners.patch
View file