Skip to content

Commit 57ce17a

Browse files
committed
CR
1 parent 1a03647 commit 57ce17a

2 files changed

Lines changed: 3 additions & 13 deletions

File tree

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/pearl/FightPearlController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ public void onPearlDamage(EntityDamageByEntityEvent event) {
8282
}
8383

8484
@EventHandler(priority = EventPriority.HIGHEST)
85-
public void onPearlStasisTeleport(PlayerTeleportEvent event) {
85+
public void onPearlTeleport(PlayerTeleportEvent event) {
8686
if (event.getCause() != PlayerTeleportEvent.TeleportCause.ENDER_PEARL) {
8787
return;
8888
}
8989

90-
if (!this.settings.preventPearlStasis) {
90+
if (!this.settings.pearlThrowDisabledDuringCombat) {
9191
return;
9292
}
9393

@@ -102,7 +102,7 @@ public void onPearlStasisTeleport(PlayerTeleportEvent event) {
102102

103103
this.noticeService.create()
104104
.player(playerId)
105-
.notice(this.settings.pearlTeleportBlockedDuringCombat)
105+
.notice(this.settings.pearlThrowBlockedDuringCombat)
106106
.send();
107107
}
108108

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/pearl/FightPearlSettings.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ public class FightPearlSettings extends OkaeriConfig {
2020
@Comment("# Set true, If you want add cooldown to pearls")
2121
public boolean pearlCooldownEnabled = false;
2222

23-
@Comment({
24-
"# Prevent players from using ender pearl stasis to avoid combat.",
25-
"# This setting prevents the player from teleporting with a statis pearl during combat."
26-
})
27-
public boolean preventPearlStasis = false;
28-
2923
@Comment({
3024
"# Block throwing pearls with delay?",
3125
"# If you set this to for example 3s, player will have to wait 3 seconds before throwing another pearl"
@@ -42,8 +36,4 @@ public class FightPearlSettings extends OkaeriConfig {
4236
.chat("<red>You must wait {TIME} before next throw!")
4337
.build();
4438

45-
@Comment("# Message sent when player tries to teleport with ender pearl, but are disabled")
46-
public Notice pearlTeleportBlockedDuringCombat = BukkitNotice.builder()
47-
.chat("<red>Teleporting through ender pearls is not allowed during combat!")
48-
.build();
4939
}

0 commit comments

Comments
 (0)