Skip to content
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

Jump to bottom

Allowed players to eat in creative mode and difficulty peaceful #5923

Open
wants to merge 12 commits into
base: minor-next
Choose a base branch
from
Open

Allowed players to eat in creative mode and difficulty peaceful #5923

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
433458a
allowed creative players to eat
NTT1906 Jul 20, 2023
23cd076
Merge branch 'pmmp:stable' into creative-eat
NTT1906 Jul 24, 2023
7cdb9ec
Applied requested changes
NTT1906 Jul 24, 2023
9bf753c
lint
NTT1906 Jul 24, 2023
3e75acd
Added Human::allowForceEating()
NTT1906 Jul 24, 2023
57690df
oof
NTT1906 Jul 24, 2023
6f1d0eb
lint
NTT1906 Jul 24, 2023
c73d66e
Update src/player/Player.php
NTT1906 Aug 10, 2023
63fe05e
apply changes
NTT1906 Aug 10, 2023
a95fb6f
Merge remote-tracking branch 'origin/creative-eat' into creative-eat
NTT1906 Aug 10, 2023
51431a8
Merge branch 'minor-next' into creative-eat
NTT1906 Aug 13, 2023
abbcafe
Merge branch 'minor-next' into creative-eat
NTT1906 Oct 3, 2024
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
9 changes: 7 additions & 2 deletions src/entity/Human.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,13 @@ public function getHungerManager() : HungerManager{
}

public function consumeObject(Consumable $consumable) : bool{
NTT1906 marked this conversation as resolved.
Show resolved Hide resolved
if($consumable instanceof FoodSource && $consumable->requiresHunger() && !$this->hungerManager->isHungry()){
return false;
if ($consumable instanceof FoodSource) {
NTT1906 marked this conversation as resolved.
Show resolved Hide resolved
if ($this instanceof Player && $this->allowForceEating()) {
NTT1906 marked this conversation as resolved.
Show resolved Hide resolved
return parent::consumeObject($consumable);
}
if ($consumable->requiresHunger() && !$this->getHungerManager()->isHungry()){
return false;
}
}

ShockedPlot7560 marked this conversation as resolved.
Show resolved Hide resolved
return parent::consumeObject($consumable);
Expand Down
2 changes: 1 addition & 1 deletion src/item/Food.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ public function onConsume(Living $consumer) : void{
}

public function canStartUsingItem(Player $player) : bool{
return !$this->requiresHunger() || $player->getHungerManager()->isHungry();
return $player->allowForceEating() || !$this->requiresHunger() || $player->getHungerManager()->isHungry();
}
}
7 changes: 7 additions & 0 deletions src/player/Player.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,13 @@ public function setUsingItem(bool $value) : void{
$this->networkPropertiesDirty = true;
}

/**
* Allow eating
*/
public function allowForceEating () : bool{
NTT1906 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of this name. It feels way too specific.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of this name. It feels way too specific.

what is your idea?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

canPlayerConsume

canPlayerSnack
canPlayerChew
canPlayerDevour
isPlayerFamished

allowForceFeast
canFreelyEating

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could canEatAnytime better ? It can't include player because it's linked to Human and not only Player.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None of these address my original comment.
I'm thinking more along the lines of canEat(), which covers the creative case and hunger together.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

canEat() seems too general, but I too go with that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ShockedPlot7560 Can I go with "canEatWithoutHunger"?

return $this->isCreative() || $this->getWorld()->getDifficulty() === World::DIFFICULTY_PEACEFUL;
}

/**
* Returns how long the player has been using their currently-held item for. Used for determining arrow shoot force
* for bows.
Expand Down