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.

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

Fix for handling damage event for invincible effect #205

Merged
merged 3 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package me.SuperRonanCraft.BetterRTP.player.events;

import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityDamageEvent;

public class Damage {
static boolean canCancel(EntityDamageEvent.DamageCause damageCause) {
return true; // TODO: Allow for filtering damage causes
}

static boolean isInInvincibleMode(Player player) {
return HelperPlayer.getData(player).getInvincibleEndTime() > System.currentTimeMillis();
}

static void onEntityDamage(EntityDamageEvent event) {
Entity entity = event.getEntity();
if (!(entity instanceof Player)) return;
Player player = (Player) entity;

if (!canCancel(event.getCause())) return;
if (!isInInvincibleMode(player)) return;

event.setCancelled(true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.SignChangeEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.player.*;
import org.bukkit.event.world.WorldLoadEvent;
Expand Down Expand Up @@ -67,4 +68,9 @@ private void worldLoad(WorldLoadEvent e) {
private void onRespawn(PlayerRespawnEvent e) {
Death.respawnEvent(e);
}

@EventHandler
private void onDamage(EntityDamageEvent e) {
Damage.onEntityDamage(e);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
Expand Down Expand Up @@ -52,7 +53,7 @@ void load() {
public void giveEffects(Player p) {
AsyncHandler.syncAtEntity(p, () -> {
if (invincibleEnabled)
p.setNoDamageTicks(invincibleTime * 20);
HelperPlayer.getData(p).setInvincibleEndTime(System.currentTimeMillis() + (invincibleTime * 1000L));
if (potionEnabled) {
List<PotionEffect> effects = new ArrayList<>();
for (PotionEffectType e : potionEffects.keySet()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class PlayerData {
@Getter @Setter boolean rtping;
@Getter @Setter int rtpCount;
@Getter @Setter long globalCooldown;
@Getter @Setter long invincibleEndTime;

PlayerData(Player player) {
this.player = player;
Expand Down
Loading