etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1426 from Corail31/BOP-1.14.x-9.x.x 

fix boat inputs allowing to move
This commit is contained in:
Forstride 2019-07-29 14:07:52 -04:00 committed by GitHub
parent 8c4c64d559 c341b1d687
commit 5193e0e67c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/biomesoplenty/api/entity/BOPEntities.java
View File

@ -7,10 +7,9 @@
******************************************************************************/ ******************************************************************************/
package biomesoplenty.api.entity; package biomesoplenty.api.entity;
import biomesoplenty.common.entity.item.BoatEntityBOP;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
public class BOPEntities public class BOPEntities
{ {
public static EntityType<BoatEntityBOP> boat_bop; public static EntityType<?> boat_bop;
} }

12
src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java
View File

@ -6,6 +6,7 @@ import biomesoplenty.api.item.BOPItems;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.LilyPadBlock; import net.minecraft.block.LilyPadBlock;
import net.minecraft.client.entity.player.ClientPlayerEntity;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
@ -76,7 +77,7 @@ public class BoatEntityBOP extends Entity {
private float rockingAngle; private float rockingAngle;
private float prevRockingAngle; private float prevRockingAngle;
public BoatEntityBOP(EntityType<BoatEntityBOP> p_i50129_1_, World p_i50129_2_) { public BoatEntityBOP(EntityType<?> p_i50129_1_, World p_i50129_2_) {
super(p_i50129_1_, p_i50129_2_); super(p_i50129_1_, p_i50129_2_);
this.preventEntitySpawning = true; this.preventEntitySpawning = true;
} }
@ -272,6 +273,15 @@ public class BoatEntityBOP extends Entity {
*/ */
@Override @Override
public void tick() { public void tick() {
if (this.world.isRemote) {
Entity rider = getControllingPassenger();
if (rider instanceof PlayerEntity) {
ClientPlayerEntity player = (ClientPlayerEntity) rider;
updateInputs(player.movementInput.leftKeyDown, player.movementInput.rightKeyDown, player.movementInput.forwardKeyDown, player.movementInput.backKeyDown);
player.rowingBoat |= player.movementInput.leftKeyDown || player.movementInput.rightKeyDown || player.movementInput.forwardKeyDown || player.movementInput.backKeyDown;
}
}
this.previousStatus = this.status; this.previousStatus = this.status;
this.status = this.getBoatStatus(); this.status = this.getBoatStatus();
if (this.status != BoatEntityBOP.Status.UNDER_WATER && this.status != BoatEntityBOP.Status.UNDER_FLOWING_WATER) { if (this.status != BoatEntityBOP.Status.UNDER_WATER && this.status != BoatEntityBOP.Status.UNDER_FLOWING_WATER) {

2
src/main/resources/META-INF/accesstransformer.cfg
View File

@ -16,3 +16,5 @@ public-f net.minecraft.item.AxeItem field_203176_a # BLOCK_STRIPPING_MAP
# server.properties world type hackery # server.properties world type hackery
public-f net.minecraft.server.dedicated.ServerProperties * public-f net.minecraft.server.dedicated.ServerProperties *
public net.minecraft.server.dedicated.PropertyManager * public net.minecraft.server.dedicated.PropertyManager *
public net.minecraft.client.entity.player.ClientPlayerEntity field_184844_co # rowingBoat