Skip to content

Commit f2fca44

Browse files
committed
Check for canvas using FQCN
1 parent 12e4545 commit f2fca44

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/main/java/com/gmail/llmdlio/townyflight/TownyFlight.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.palmergames.bukkit.towny.scheduling.impl.BukkitTaskScheduler;
66
import com.palmergames.bukkit.towny.scheduling.impl.FoliaTaskScheduler;
77

8-
import io.papermc.paper.ServerBuildInfo;
98
import net.kyori.adventure.key.Key;
109
import org.bukkit.Bukkit;
1110
import org.bukkit.entity.Player;
@@ -35,7 +34,6 @@
3534
import com.palmergames.bukkit.util.Version;
3635

3736
public class TownyFlight extends JavaPlugin {
38-
private static final Key CANVAS_BRAND_ID = Key.key("canvasmc", "canvas");
3937
private static final Version requiredTownyVersion = Version.fromString("0.102.0.0");
4038
private TownyFlightConfig config = new TownyFlightConfig(this);
4139
private static TownyFlight plugin;
@@ -134,8 +132,11 @@ public void registerEvents() {
134132
pm.registerEvents(new TownStatusScreenListener(), this);
135133
pm.registerEvents(new PlayerEnterTownListener(this), this);
136134

137-
if (ServerBuildInfo.buildInfo().isBrandCompatible(CANVAS_BRAND_ID)) {
135+
try {
136+
Class.forName("io.canvasmc.canvas.event.EntityTeleportAsyncEvent");
138137
pm.registerEvents(new ExternalCanvasListener(playerTeleportListener), this);
138+
} catch (ClassNotFoundException ignored) {
139+
// Not a Canvas server
139140
}
140141

141142
if (Settings.disableCombatPrevention)

src/main/java/com/gmail/llmdlio/townyflight/listeners/ExternalCanvasListener.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import io.canvasmc.canvas.event.EntityPostPortalAsyncEvent;
44
import io.canvasmc.canvas.event.EntityTeleportAsyncEvent;
5-
import org.bukkit.PortalType;
65
import org.bukkit.entity.Player;
76
import org.bukkit.event.EventHandler;
87
import org.bukkit.event.Listener;

0 commit comments

Comments
 (0)