File tree Expand file tree Collapse file tree
src/main/java/com/gmail/llmdlio/townyflight Expand file tree Collapse file tree Original file line number Diff line number Diff line change 55import com .palmergames .bukkit .towny .scheduling .impl .BukkitTaskScheduler ;
66import com .palmergames .bukkit .towny .scheduling .impl .FoliaTaskScheduler ;
77
8- import io .papermc .paper .ServerBuildInfo ;
98import net .kyori .adventure .key .Key ;
109import org .bukkit .Bukkit ;
1110import org .bukkit .entity .Player ;
3534import com .palmergames .bukkit .util .Version ;
3635
3736public 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 )
Original file line number Diff line number Diff line change 22
33import io .canvasmc .canvas .event .EntityPostPortalAsyncEvent ;
44import io .canvasmc .canvas .event .EntityTeleportAsyncEvent ;
5- import org .bukkit .PortalType ;
65import org .bukkit .entity .Player ;
76import org .bukkit .event .EventHandler ;
87import org .bukkit .event .Listener ;
You can’t perform that action at this time.
0 commit comments