Update to Minecraft 1.16.1

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions

View File

@@ -30,8 +30,8 @@
public TileEntityBeacon() {
super(TileEntityTypes.BEACON);
@@ -194,39 +210,78 @@
super.ab_();
@@ -192,39 +208,78 @@
super.an_();
}
- private void applyEffects() {
@@ -119,10 +119,10 @@
public void a(SoundEffect soundeffect) {
this.world.playSound((EntityHuman) null, this.position, soundeffect, SoundCategory.BLOCKS, 1.0F, 1.0F);
}
@@ -256,8 +311,11 @@
@@ -254,8 +309,11 @@
@Override
public void load(NBTTagCompound nbttagcompound) {
super.load(nbttagcompound);
public void load(IBlockData iblockdata, NBTTagCompound nbttagcompound) {
super.load(iblockdata, nbttagcompound);
- this.primaryEffect = b(nbttagcompound.getInt("Primary"));
- this.secondaryEffect = b(nbttagcompound.getInt("Secondary"));
+ // CraftBukkit start - persist manually set non-default beacon effects (SPIGOT-3598)