From 6da8a9ec7f5a5dd0fde5fc4672152a1dc9dd8f74 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 13 May 2019 21:34:51 -0500 Subject: [PATCH] Update to 1.14.1 --- Paper | 2 +- current-paper | 2 +- patches/api/0001-Rebrand.patch | 10 +- patches/server/0001-Rebrand.patch | 10 +- ...cows-to-mooshroom-when-fed-mushrooms.patch | 10 +- patches/server/0011-Integrate-ridables.patch | 20 +-- ...Remove-useless-cooldown-in-Villagers.patch | 18 +- ...fig-to-suppress-specific-log-outputs.patch | 26 +-- patches/server/0014-Villager-shops.patch | 28 +-- ...etHeight-methods-for-World-and-IBloc.patch | 169 ------------------ 10 files changed, 55 insertions(+), 240 deletions(-) delete mode 100644 patches/server/0017-Fix-mis-mapped-getHeight-methods-for-World-and-IBloc.patch diff --git a/Paper b/Paper index 92e77aa7c..d84080e6d 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 92e77aa7cbbf626cb9e6fad97032509de74a2018 +Subproject commit d84080e6d14235a1f649a328ab968d9fbc48a141 diff --git a/current-paper b/current-paper index 996b62f8b..336274ad4 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14--3811479ebbf8485ed9f48a31ae2fddfb0d0960d9 +1.14.1--84a8222afb8087fee15785a8f72b5e49da3df13f diff --git a/patches/api/0001-Rebrand.patch b/patches/api/0001-Rebrand.patch index a119b32f4..6c66833cc 100644 --- a/patches/api/0001-Rebrand.patch +++ b/patches/api/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From 030c7d02cb82e6d69c78911fb6deaceabd05f7c7 Mon Sep 17 00:00:00 2001 +From 053dd1e014ce1dc92795b080f59a2ac00b2234ef Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 00:57:16 -0500 Subject: [PATCH] Rebrand @@ -9,12 +9,12 @@ Subject: [PATCH] Rebrand 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml -index 81aefdf7..d73f48ae 100644 +index dbbb5c72..41743131 100644 --- a/pom.xml +++ b/pom.xml -@@ -4,18 +4,17 @@ +@@ -3,18 +3,17 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.destroystokyo.paper - paper-parent @@ -26,7 +26,7 @@ index 81aefdf7..d73f48ae 100644 - com.destroystokyo.paper - paper-api + purpur-api - 1.14-R0.1-SNAPSHOT + 1.14.1-R0.1-SNAPSHOT jar Paper-API diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 10201d41e..533dff5c6 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From a9c61ea092067c2508ba72f175fbde0e29602260 Mon Sep 17 00:00:00 2001 +From f0f99f77774709baa07af666ddb010f4fb93da02 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -12,7 +12,7 @@ Subject: [PATCH] Rebrand 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml -index 8c18a0c09..dcbf59fbe 100644 +index e01d95f17..4955fa3e8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -22,7 +22,7 @@ index 8c18a0c09..dcbf59fbe 100644 - paper + purpur jar - 1.14-R0.1-SNAPSHOT + 1.14.1-R0.1-SNAPSHOT - Paper - https://papermc.io + Purpur @@ -83,7 +83,7 @@ index cd6e25923..bb227bc0f 100644 ); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 33c7a295e..f6e27f2fb 100644 +index 70f730996..f2b243326 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1405,7 +1405,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 4 May 2019 01:10:30 -0500 Subject: [PATCH] cows to mooshroom when fed mushrooms @@ -9,7 +9,7 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3d60b5c28..9834a8928 100644 +index d02e48a86..ab0995c2c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -995,6 +995,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -21,7 +21,7 @@ index 3d60b5c28..9834a8928 100644 if (!this.isSilent()) { this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.getSoundCategory(), f, f1); diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index d2c2e3cc3..4b460a0a7 100644 +index d2c2e3cc3..3cb35c422 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -4,6 +4,10 @@ package net.minecraft.server; @@ -87,9 +87,9 @@ index d2c2e3cc3..4b460a0a7 100644 + return false; + } + if (itemstack.getItem() == Blocks.BROWN_MUSHROOM.getItem()) { -+ mooshroom.a(EntityMushroomCow.Type.BROWN); ++ mooshroom.setVariant(EntityMushroomCow.Type.BROWN); + } else { -+ mooshroom.a(EntityMushroomCow.Type.RED); ++ mooshroom.setVariant(EntityMushroomCow.Type.RED); + } + mooshroom.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch); + mooshroom.setHealth(this.getHealth()); diff --git a/patches/server/0011-Integrate-ridables.patch b/patches/server/0011-Integrate-ridables.patch index b7dc34242..9239e1a97 100644 --- a/patches/server/0011-Integrate-ridables.patch +++ b/patches/server/0011-Integrate-ridables.patch @@ -1,4 +1,4 @@ -From bbc58082cd946c920f9856dfc17795e53d1fb651 Mon Sep 17 00:00:00 2001 +From e4504b2ee0d50998f0d405860f5d34d6f1d08ec9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 30 Apr 2019 19:17:21 -0500 Subject: [PATCH] Integrate ridables @@ -64,7 +64,7 @@ index 454627f65..df3d6cf28 100644 this.d = false; this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9834a8928..cfb2192b9 100644 +index ab0995c2c..1490f95c4 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -101,6 +101,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -84,7 +84,7 @@ index 9834a8928..cfb2192b9 100644 public boolean noclip; public float M; protected final Random random; -@@ -2073,6 +2074,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2067,6 +2068,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke // Spigot end if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.getRidingPassenger() instanceof EntityHuman)) { this.passengers.add(0, entity); @@ -92,7 +92,7 @@ index 9834a8928..cfb2192b9 100644 } else { this.passengers.add(entity); } -@@ -2111,6 +2113,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2105,6 +2107,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke return false; } // Spigot end @@ -167,7 +167,7 @@ index 56394ccdc..9e5542ade 100644 this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D)); } diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 449fbee60..c692ea296 100644 +index 817769764..f949c75d4 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -205,7 +205,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -459,7 +459,7 @@ index 1160929e1..d94063885 100644 return true; } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index e811a2917..f25c394e3 100644 +index 4bea5f1ea..ac13282a1 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -347,9 +347,21 @@ public abstract class EntityHuman extends EntityLiving { @@ -486,7 +486,7 @@ index e811a2917..f25c394e3 100644 this.setSneaking(false); } else { diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index a0c089477..d7bc766cb 100644 +index ba90cdef1..cc3e7dcad 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -63,8 +63,11 @@ public abstract class EntityInsentient extends EntityLiving { @@ -570,7 +570,7 @@ index a0c089477..d7bc766cb 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b27a9efcc..8f0c05959 100644 +index 0cb8c6cbc..27375059f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -87,10 +87,10 @@ public abstract class EntityLiving extends Entity { @@ -836,7 +836,7 @@ index f6fa87158..bd0679e74 100644 double d0 = this.moveController.c(); diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index d720d0fae..e4f7797ed 100644 +index e28c0673d..f88cd9e94 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -316,7 +316,7 @@ public class EntitySlime extends EntityInsentient implements IMonster { @@ -948,7 +948,7 @@ index 70bf06b94..2f41d8ade 100644 this.setTamed(true); this.setOwnerUUID(entityhuman.getUniqueID()); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 483c97692..181e92980 100644 +index 77d4bbce1..73116e48f 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -255,6 +255,12 @@ public class EntityTypes { diff --git a/patches/server/0012-Remove-useless-cooldown-in-Villagers.patch b/patches/server/0012-Remove-useless-cooldown-in-Villagers.patch index edd89e33c..8ba1f1822 100644 --- a/patches/server/0012-Remove-useless-cooldown-in-Villagers.patch +++ b/patches/server/0012-Remove-useless-cooldown-in-Villagers.patch @@ -1,4 +1,4 @@ -From dae587f9148c0724d728f408425908dc0d867e60 Mon Sep 17 00:00:00 2001 +From f9785380f7c40f676ef7415b84a70c4bcb546f04 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 10 May 2019 14:34:35 -0500 Subject: [PATCH] Remove useless cooldown in Villagers @@ -8,20 +8,20 @@ Subject: [PATCH] Remove useless cooldown in Villagers 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index d489a5a8c..5c0d8b063 100644 +index f2b46d4e3..72701ef4a 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -186,10 +186,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @Override public void tick() { super.tick(); -- if (this.ec() > 0) { -- this.r(this.ec() - 1); +- if (this.dV() > 0) { +- this.q(this.dV() - 1); - } - + // Purpur start - remove useless cooldown -+ //if (this.ec() > 0) { -+ // this.r(this.ec() - 1); ++ //if (this.dV() > 0) { ++ // this.q(this.dV() - 1); + //} + // Purpur end } @@ -30,9 +30,9 @@ index d489a5a8c..5c0d8b063 100644 @@ -231,7 +232,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation } - private void es() { -- this.r(40); -+ // this.r(40); // Purpur - remove useless cooldown + private void er() { +- this.q(40); ++ // this.q(40); // Purpur - remove useless cooldown if (!this.world.e()) { this.a(SoundEffects.ENTITY_VILLAGER_NO, this.getSoundVolume(), this.cU()); } diff --git a/patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch b/patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch index f3601927d..eddfa7ee7 100644 --- a/patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch +++ b/patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch @@ -1,13 +1,13 @@ -From b7792aa787f7a551ea71db7ea3f9e6b147c50b7d Mon Sep 17 00:00:00 2001 +From a75c3aea676e3f4d63a74ebd6f17b443165f7cb3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 10 May 2019 19:17:36 -0500 Subject: [PATCH] Add config to suppress specific log outputs --- src/main/java/net/minecraft/server/GenericAttributes.java | 1 + - src/main/java/net/minecraft/server/WorldServer.java | 7 ++----- + src/main/java/net/minecraft/server/WorldServer.java | 3 ++- src/main/java/net/pl3x/purpur/PurpurConfig.java | 7 +++++++ - 3 files changed, 10 insertions(+), 5 deletions(-) + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java index 908f11f98..20c3b37d3 100644 @@ -22,7 +22,7 @@ index 908f11f98..20c3b37d3 100644 } else { a(attributeinstance, nbttagcompound); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 03da9b3f2..f51d8389b 100644 +index 101f4ee5d..6c41c65fc 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1,7 +1,6 @@ @@ -33,23 +33,7 @@ index 03da9b3f2..f51d8389b 100644 import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Queues; -@@ -34,15 +33,11 @@ import org.apache.logging.log4j.LogManager; - import org.apache.logging.log4j.Logger; - - // CraftBukkit start --import java.util.logging.Level; - import org.bukkit.Bukkit; - - import org.bukkit.WeatherType; --import org.bukkit.block.BlockState; - import org.bukkit.craftbukkit.event.CraftEventFactory; --import org.bukkit.craftbukkit.util.HashTreeSet; - --import org.bukkit.event.block.BlockFormEvent; - import org.bukkit.event.entity.CreatureSpawnEvent; - import org.bukkit.event.server.MapInitializeEvent; - import org.bukkit.event.weather.LightningStrikeEvent; -@@ -984,8 +979,10 @@ public class WorldServer extends World { +@@ -977,8 +976,10 @@ public class WorldServer extends World { if (entity1 == null) { return false; } else { diff --git a/patches/server/0014-Villager-shops.patch b/patches/server/0014-Villager-shops.patch index f0f39fed5..b6a3fcef7 100644 --- a/patches/server/0014-Villager-shops.patch +++ b/patches/server/0014-Villager-shops.patch @@ -1,4 +1,4 @@ -From a506f042b4448e27fce1e3ceae3b77bbdc9c654f Mon Sep 17 00:00:00 2001 +From 832abc735f332df25b27e9c94013125a9e0b8b82 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 11 May 2019 01:31:50 -0500 Subject: [PATCH] Villager shops @@ -13,7 +13,7 @@ Subject: [PATCH] Villager shops create mode 100644 src/main/java/net/minecraft/server/EntityVillagerShop.java diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 181e92980..24bcbce01 100644 +index 73116e48f..8c67110c8 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -118,6 +118,7 @@ public class EntityTypes { @@ -40,20 +40,20 @@ index 181e92980..24bcbce01 100644 return IRegistry.ENTITY_TYPE.getKey(entitytypes); } diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java -index 7cc31be17..4fd1b0eca 100644 +index d78528696..8c75daee2 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java -@@ -54,6 +54,7 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP +@@ -68,6 +68,7 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP return this.tradingPlayer; } -+ public boolean hasTrader() { return dX(); } // Purpur - OBFHELPER - public boolean dX() { ++ public boolean hasTrader() { return dY(); } // Purpur - OBFHELPER + public boolean dY() { return this.tradingPlayer != null; } diff --git a/src/main/java/net/minecraft/server/EntityVillagerShop.java b/src/main/java/net/minecraft/server/EntityVillagerShop.java new file mode 100644 -index 000000000..d45165fd7 +index 000000000..eb7213217 --- /dev/null +++ b/src/main/java/net/minecraft/server/EntityVillagerShop.java @@ -0,0 +1,227 @@ @@ -70,7 +70,7 @@ index 000000000..d45165fd7 + private BlockPosition home; + + public EntityVillagerShop(EntityTypes entitytypes, World world) { -+ this(EntityTypes.VILLAGER, world, VillagerType.c); ++ this(EntityTypes.VILLAGER, world, VillagerType.PLAINS); + } + + public EntityVillagerShop(EntityTypes entitytypes, World world, VillagerType villagertype) { @@ -95,7 +95,7 @@ index 000000000..d45165fd7 + @Override + protected void initDatawatcher() { + super.initDatawatcher(); -+ this.datawatcher.register(VILLAGER_DATA, new VillagerData(VillagerType.c, VillagerProfession.NONE, 1)); ++ this.datawatcher.register(VILLAGER_DATA, new VillagerData(VillagerType.PLAINS, VillagerProfession.NONE, 1)); + } + + public void setVillagerData(VillagerData villagerdata) { @@ -144,7 +144,7 @@ index 000000000..d45165fd7 + } + + @Override -+ public boolean dZ() { // showProfessionProgressBar ++ public boolean ea() { // showProfessionProgressBar + return false; + } + @@ -155,7 +155,7 @@ index 000000000..d45165fd7 + itemstack.a(entityhuman, this, enumhand); + return true; + } -+ if (itemstack.getItem() != Items.VILLAGER_SPAWN_EGG && this.isAlive() && !this.dX() && !this.isSleeping()) { ++ if (itemstack.getItem() != Items.VILLAGER_SPAWN_EGG && this.isAlive() && !this.dY() && !this.isSleeping()) { + if (enumhand == EnumHand.MAIN_HAND) { + entityhuman.a(StatisticList.TALKED_TO_VILLAGER); + } @@ -285,10 +285,10 @@ index 000000000..d45165fd7 + } +} diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 583f2c5ad..87cb34519 100644 +index 1bf7ead71..46a6511f7 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java -@@ -126,6 +126,7 @@ public abstract class NavigationAbstract { +@@ -125,6 +125,7 @@ public abstract class NavigationAbstract { } } @@ -296,7 +296,7 @@ index 583f2c5ad..87cb34519 100644 public boolean a(double d0, double d1, double d2, double d3) { return this.a(this.a(d0, d1, d2), d3); } -@@ -280,6 +281,7 @@ public abstract class NavigationAbstract { +@@ -258,6 +259,7 @@ public abstract class NavigationAbstract { } diff --git a/patches/server/0017-Fix-mis-mapped-getHeight-methods-for-World-and-IBloc.patch b/patches/server/0017-Fix-mis-mapped-getHeight-methods-for-World-and-IBloc.patch deleted file mode 100644 index 39367f499..000000000 --- a/patches/server/0017-Fix-mis-mapped-getHeight-methods-for-World-and-IBloc.patch +++ /dev/null @@ -1,169 +0,0 @@ -From c216c73efbb003aeb654a726e151c909983c5398 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sun, 12 May 2019 06:15:25 -0500 -Subject: [PATCH] Fix mis-mapped getHeight methods for World and IBlockAccess - ---- - src/main/java/net/minecraft/server/BlockPiston.java | 2 +- - src/main/java/net/minecraft/server/ChunkConverter.java | 4 ++-- - src/main/java/net/minecraft/server/IBlockAccess.java | 2 +- - src/main/java/net/minecraft/server/ItemScaffolding.java | 2 +- - src/main/java/net/minecraft/server/Navigation.java | 4 ++-- - .../java/net/minecraft/server/RandomPositionGenerator.java | 2 +- - src/main/java/net/minecraft/server/TileEntityBeacon.java | 2 +- - src/main/java/net/minecraft/server/TileEntityConduit.java | 2 +- - src/main/java/net/minecraft/server/World.java | 2 +- - src/main/java/net/minecraft/server/WorldServer.java | 2 +- - 10 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java -index a5573f21f..5000a1243 100644 ---- a/src/main/java/net/minecraft/server/BlockPiston.java -+++ b/src/main/java/net/minecraft/server/BlockPiston.java -@@ -248,7 +248,7 @@ public class BlockPiston extends BlockDirectional { - } else if (!world.getWorldBorder().a(blockposition)) { - return false; - } else if (blockposition.getY() >= 0 && (enumdirection != EnumDirection.DOWN || blockposition.getY() != 0)) { -- if (blockposition.getY() <= world.getHeight() - 1 && (enumdirection != EnumDirection.UP || blockposition.getY() != world.getHeight() - 1)) { -+ if (blockposition.getY() <= world.getDefHeight() - 1 && (enumdirection != EnumDirection.UP || blockposition.getY() != world.getDefHeight() - 1)) { // Purpur - use bgr.I() - if (block != Blocks.PISTON && block != Blocks.STICKY_PISTON) { - if (iblockdata.f(world, blockposition) == -1.0F) { - return false; -diff --git a/src/main/java/net/minecraft/server/ChunkConverter.java b/src/main/java/net/minecraft/server/ChunkConverter.java -index 9781b092e..0e4116f09 100644 ---- a/src/main/java/net/minecraft/server/ChunkConverter.java -+++ b/src/main/java/net/minecraft/server/ChunkConverter.java -@@ -94,7 +94,7 @@ public class ChunkConverter { - int l = chunkcoordintpair.e() + (flag6 && (flag2 || flag3) ? 14 : (flag5 ? 0 : 15)); - EnumDirection[] aenumdirection = EnumDirection.values(); - BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); -- Iterator iterator = BlockPosition.b(i, 0, k, j, world.getHeight() - 1, l).iterator(); -+ Iterator iterator = BlockPosition.b(i, 0, k, j, world.getDefHeight() - 1, l).iterator(); // Purpur - use bgr.I() - - while (iterator.hasNext()) { - BlockPosition blockposition = (BlockPosition) iterator.next(); -@@ -343,7 +343,7 @@ public class ChunkConverter { - if ((Integer) iblockdata.get(BlockProperties.ah) >= j) { - generatoraccess.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockProperties.ah, j), 18); - if (i != 7) { -- EnumDirection[] aenumdirection = null.f; -+ EnumDirection[] aenumdirection = f; // Purpur - decompile error - int k = aenumdirection.length; - - for (int l = 0; l < k; ++l) { -diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java -index c44edda65..1f0fd6869 100644 ---- a/src/main/java/net/minecraft/server/IBlockAccess.java -+++ b/src/main/java/net/minecraft/server/IBlockAccess.java -@@ -21,7 +21,7 @@ public interface IBlockAccess { - return 15; - } - -- default int getHeight() { -+ default int getDefHeight() { // Purpur - this is bgr.I() - return 256; - } - -diff --git a/src/main/java/net/minecraft/server/ItemScaffolding.java b/src/main/java/net/minecraft/server/ItemScaffolding.java -index 32b74f655..5cd9c5f8b 100644 ---- a/src/main/java/net/minecraft/server/ItemScaffolding.java -+++ b/src/main/java/net/minecraft/server/ItemScaffolding.java -@@ -33,7 +33,7 @@ public class ItemScaffolding extends ItemBlock { - while (i < 7) { - if (!world.isClientSide && !World.isValidLocation(blockposition_mutableblockposition)) { - EntityHuman entityhuman = blockactioncontext.getEntity(); -- int j = world.getHeight(); -+ int j = world.getDefHeight(); // Purpur - use bgr.I() - - if (entityhuman instanceof EntityPlayer && blockposition_mutableblockposition.getY() >= j) { - PacketPlayOutChat packetplayoutchat = new PacketPlayOutChat((new ChatMessage("build.tooHigh", new Object[] { j})).a(EnumChatFormat.RED), ChatMessageType.GAME_INFO); -diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java -index 79b2d9297..318a70247 100644 ---- a/src/main/java/net/minecraft/server/Navigation.java -+++ b/src/main/java/net/minecraft/server/Navigation.java -@@ -40,7 +40,7 @@ public class Navigation extends NavigationAbstract { - return super.b(blockposition1.up()); - } - -- while (blockposition1.getY() < this.b.getHeight() && this.b.getType(blockposition1).isAir()) { -+ while (blockposition1.getY() < this.b.getDefHeight() && this.b.getType(blockposition1).isAir()) { // Purpur - use bgr.I() - blockposition1 = blockposition1.up(); - } - -@@ -50,7 +50,7 @@ public class Navigation extends NavigationAbstract { - if (!this.b.getType(blockposition).getMaterial().isBuildable()) { - return super.b(blockposition); - } else { -- for (blockposition1 = blockposition.up(); blockposition1.getY() < this.b.getHeight() && this.b.getType(blockposition1).getMaterial().isBuildable(); blockposition1 = blockposition1.up()) { -+ for (blockposition1 = blockposition.up(); blockposition1.getY() < this.b.getDefHeight() && this.b.getType(blockposition1).getMaterial().isBuildable(); blockposition1 = blockposition1.up()) { // Purpur - use bgr.I() - ; - } - -diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java -index 78eb1b39c..82e3a0d30 100644 ---- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java -+++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java -@@ -153,7 +153,7 @@ public class RandomPositionGenerator { - } else { - BlockPosition blockposition1; - -- for (blockposition1 = blockposition.up(); blockposition1.getY() < entitycreature.world.getHeight() && entitycreature.world.getType(blockposition1).getMaterial().isBuildable(); blockposition1 = blockposition1.up()) { -+ for (blockposition1 = blockposition.up(); blockposition1.getY() < entitycreature.world.getDefHeight() && entitycreature.world.getType(blockposition1).getMaterial().isBuildable(); blockposition1 = blockposition1.up()) { // Purpur - use bgr.I() - ; - } - -diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java -index 87f77bb86..4e0ed4f27 100644 ---- a/src/main/java/net/minecraft/server/TileEntityBeacon.java -+++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java -@@ -232,7 +232,7 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic - { - double d0 = (double) (this.levels * 10 + 10); - -- AxisAlignedBB axisalignedbb = (new AxisAlignedBB(this.position)).g(d0).b(0.0D, (double) this.world.getHeight(), 0.0D); -+ AxisAlignedBB axisalignedbb = (new AxisAlignedBB(this.position)).g(d0).b(0.0D, (double) this.world.getDefHeight(), 0.0D); // Purpur - use bgr.I() - List list = this.world.a(EntityHuman.class, axisalignedbb); - - return list; -diff --git a/src/main/java/net/minecraft/server/TileEntityConduit.java b/src/main/java/net/minecraft/server/TileEntityConduit.java -index b9a0cf4f9..44c363f4d 100644 ---- a/src/main/java/net/minecraft/server/TileEntityConduit.java -+++ b/src/main/java/net/minecraft/server/TileEntityConduit.java -@@ -152,7 +152,7 @@ public class TileEntityConduit extends TileEntity implements ITickable { - int k = this.position.getX(); - int l = this.position.getY(); - int i1 = this.position.getZ(); -- AxisAlignedBB axisalignedbb = (new AxisAlignedBB((double) k, (double) l, (double) i1, (double) (k + 1), (double) (l + 1), (double) (i1 + 1))).g((double) j).b(0.0D, (double) this.world.getHeight(), 0.0D); -+ AxisAlignedBB axisalignedbb = (new AxisAlignedBB((double) k, (double) l, (double) i1, (double) (k + 1), (double) (l + 1), (double) (i1 + 1))).g((double) j).b(0.0D, (double) this.world.getDefHeight(), 0.0D); // Purpur - use bgr.I() - List list = this.world.a(EntityHuman.class, axisalignedbb); - - if (!list.isEmpty()) { -diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a9a358955..d9cbfbe4a 100644 ---- a/src/main/java/net/minecraft/server/World.java -+++ b/src/main/java/net/minecraft/server/World.java -@@ -1450,7 +1450,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose - - public void b(int i, BlockPosition blockposition, int j) {} - -- @Override -+ //@Override // Purpur - this is bhh.W() not bgr.I() there is a HUGE difference! - public int getHeight() { - return this.worldProvider.h() ? 128 : 256; - } -diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f51d8389b..7862c18e7 100644 ---- a/src/main/java/net/minecraft/server/WorldServer.java -+++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -469,7 +469,7 @@ public class WorldServer extends World { - - protected BlockPosition a(BlockPosition blockposition) { - BlockPosition blockposition1 = this.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, blockposition); -- AxisAlignedBB axisalignedbb = (new AxisAlignedBB(blockposition1, new BlockPosition(blockposition1.getX(), this.getHeight(), blockposition1.getZ()))).g(3.0D); -+ AxisAlignedBB axisalignedbb = (new AxisAlignedBB(blockposition1, new BlockPosition(blockposition1.getX(), this.getDefHeight(), blockposition1.getZ()))).g(3.0D); // Purpur - use bgr.I() - List list = this.a(EntityLiving.class, axisalignedbb, (java.util.function.Predicate) (entityliving) -> { // CraftBukkit - decompile error - return entityliving != null && entityliving.isAlive() && this.f(entityliving.getChunkCoordinates()); - }); --- -2.20.1 -