mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-01 00:50:41 +01:00
[CI-SKIP] [Auto] Rebuild Patches
A recent commit has been made that caused patches to be out of order, rebuilding
This commit is contained in:
parent
a33232d4a6
commit
840e72091f
4 changed files with 5 additions and 5 deletions
|
@ -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
|
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
|
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java
|
||||||
+++ b/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.craftbukkit.event.CraftEventFactory;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import com.destroystokyo.paper.event.block.BeaconEffectEvent;
|
import com.destroystokyo.paper.event.block.BeaconEffectEvent;
|
||||||
|
@ -17,7 +17,7 @@ index 8dfb9eb12d07c2d4737ecf3de1ae7f6de31891bf..732398fb0ae6427c776d8a56aed9afd4
|
||||||
// Paper end
|
// Paper end
|
||||||
|
|
||||||
public class TileEntityBeacon extends TileEntity implements ITileInventory, ITickable {
|
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;
|
boolean flag1 = this.levels > 0;
|
||||||
|
|
||||||
if (!flag && flag1) {
|
if (!flag && flag1) {
|
||||||
|
@ -28,7 +28,7 @@ index 8dfb9eb12d07c2d4737ecf3de1ae7f6de31891bf..732398fb0ae6427c776d8a56aed9afd4
|
||||||
this.a(SoundEffects.BLOCK_BEACON_ACTIVATE);
|
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();
|
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);
|
CriterionTriggers.l.a(entityplayer, this);
|
||||||
}
|
}
|
||||||
} else if (flag && !flag1) {
|
} else if (flag && !flag1) {
|
||||||
|
@ -39,7 +39,7 @@ index 8dfb9eb12d07c2d4737ecf3de1ae7f6de31891bf..732398fb0ae6427c776d8a56aed9afd4
|
||||||
this.a(SoundEffects.BLOCK_BEACON_DEACTIVATE);
|
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
|
@Override
|
||||||
public void al_() {
|
public void al_() {
|
Loading…
Reference in a new issue