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

Implement Fatal Poison #1758

Merged
merged 1 commit into from
Feb 14, 2021
Merged

Implement Fatal Poison #1758

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
4 changes: 3 additions & 1 deletion src/main/java/cn/nukkit/potion/Effect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ public boolean canTick() {
int interval;
switch (this.id) {
case Effect.POISON: //POISON
case Effect.FATAL_POISON:
if ((interval = (25 >> this.amplifier)) > 0) {
return (this.duration % interval) == 0;
}
Expand All @@ -200,7 +201,8 @@ public boolean canTick() {
public void applyEffect(Entity entity) {
switch (this.id) {
case Effect.POISON: //POISON
if (entity.getHealth() > 1) {
case Effect.FATAL_POISON:
if (entity.getHealth() > 1 || this.id == FATAL_POISON) {
entity.attack(new EntityDamageEvent(entity, DamageCause.MAGIC, 1));
}
break;
Expand Down