Skip to content

Flutter Pot Fix #2222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CrimsonCrips wants to merge 1 commit into
base: 1.20
Choose a base branch
from
Open

Flutter Pot Fix #2222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/main/java/com/github/alexthe666/alexsmobs/item/ItemFlutterPot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public InteractionResult useOn(UseOnContext context) {
Level world = context.getLevel();
BlockPos blockpos = context.getClickedPos();
if(!world.isClientSide){
if(this.placeFish((ServerLevel)world, context.getItemInHand(), blockpos) && (context.getPlayer() == null || !context.getPlayer().isCreative())){
if(this.placePot((ServerLevel)world, context.getItemInHand(), blockpos,context.getPlayer()) && (context.getPlayer() == null || !context.getPlayer().isCreative())){
context.getItemInHand().shrink(1);
}
return InteractionResult.sidedSuccess(world.isClientSide);
Expand All @@ -46,12 +46,14 @@ protected void playEmptySound(@Nullable Player player, LevelAccessor worldIn, Bl
worldIn.playSound(player, pos, SoundEvents.BUCKET_EMPTY_FISH, SoundSource.NEUTRAL, 1.0F, 1.0F);
}

private boolean placeFish(ServerLevel worldIn, ItemStack stack, BlockPos pos) {
Entity entity = AMEntityRegistry.FLUTTER.get().spawn(worldIn, stack, (Player)null, pos, MobSpawnType.BUCKET, true, false);
if (entity != null && entity instanceof EntityFlutter) {
private boolean placePot(ServerLevel worldIn, ItemStack stack, BlockPos pos, Player player) {
EntityFlutter entity = AMEntityRegistry.FLUTTER.get().spawn(worldIn, stack, (Player)null, pos, MobSpawnType.BUCKET, true, false);
if (entity instanceof EntityFlutter) {
CompoundTag compoundnbt = stack.getOrCreateTag();
if(compoundnbt.contains("FlutterData")){
((EntityFlutter)entity).readAdditionalSaveData(compoundnbt.getCompound("FlutterData"));
entity.readAdditionalSaveData(compoundnbt.getCompound("FlutterData"));
} else {
entity.setPotted(true);
}
return true;
}
Expand Down