diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index dce7b13ef68ffcc4188ef9904663488adaf97728..49b47e68bf25f0b5911264375ba7d88b3c5e515f 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.bin and b/.gradle/8.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock index 3ee9d16e1044b097aae57904200ac619ef6a9d5a..300b217640b0dbceab62943c3e301bae5b477581 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.lock and b/.gradle/8.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.5/fileHashes/fileHashes.bin b/.gradle/8.5/fileHashes/fileHashes.bin index 0f3bd98f57324ab1698f63c480aa1795a8878217..353e66b2ee56588750e37d816f8031f807de2e79 100644 Binary files a/.gradle/8.5/fileHashes/fileHashes.bin and b/.gradle/8.5/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.5/fileHashes/fileHashes.lock b/.gradle/8.5/fileHashes/fileHashes.lock index 67ea60ba176b47d0a3e6cb1daf00f1916bb865b2..78c930632ade6e7f4a13a60262deb01f42d0e3d0 100644 Binary files a/.gradle/8.5/fileHashes/fileHashes.lock and b/.gradle/8.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.5/fileHashes/resourceHashesCache.bin b/.gradle/8.5/fileHashes/resourceHashesCache.bin index 410f115731ba8a7edde9b89fa6b8947e61ed37e2..b1d3bcfff84d62dd36045a3d7a012a7741f9696f 100644 Binary files a/.gradle/8.5/fileHashes/resourceHashesCache.bin and b/.gradle/8.5/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index c0a0d1fadc889152643cfc5483f8ca7103935be7..c5e2a6343ce06415027394e57713994a26dc87bd 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/java/main/FunAndElse/FreezePlayer.class b/build/classes/java/main/FunAndElse/FreezePlayer.class index ec7c978a1e87e3bbd26ead539eaa99b8663ecc93..964b064ef7693c9d333aa2520ca3c88e6b5854da 100644 Binary files a/build/classes/java/main/FunAndElse/FreezePlayer.class and b/build/classes/java/main/FunAndElse/FreezePlayer.class differ diff --git a/build/classes/java/main/FunAndElse/KeepOutOfFlying.class b/build/classes/java/main/FunAndElse/KeepOutOfFlying.class new file mode 100644 index 0000000000000000000000000000000000000000..7fd8aef1dd66cf041d285388a012f04d98512312 Binary files /dev/null and b/build/classes/java/main/FunAndElse/KeepOutOfFlying.class differ diff --git a/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class b/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class index 9a40f5fa5e4bd51fb7a1b98eb1de8501645eec5f..8b9d65bf2b5e0003ad49b40009a33eaf0a911dc6 100644 Binary files a/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class and b/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class differ diff --git a/build/libs/pixelcampusessentials-1.0.jar b/build/libs/pixelcampusessentials-1.0.jar index cfccd3c509a3045dbebdcb3acc56daf21def4db0..19a908ccc32ef5903a8a18dad7e30f3668ce3a76 100644 Binary files a/build/libs/pixelcampusessentials-1.0.jar and b/build/libs/pixelcampusessentials-1.0.jar differ diff --git a/build/resources/main/plugin.yml b/build/resources/main/plugin.yml index e6ee0b825cf50be827e8b0dcd660d15d3382e0c4..85cb2e0571516c7ec5ada5b4bb049a144b47d16f 100644 --- a/build/resources/main/plugin.yml +++ b/build/resources/main/plugin.yml @@ -23,6 +23,9 @@ commands: permission-message: '§cYou dont have Permissions to view Player stats' aliases: [stats] permissions: + pixelcampusessentials.admin: + description: All Op related + default: op pixelcampusessentials.ladder: description: speed ladder default: op diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CropHarvester.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/CropHarvester.class.uniqueId0 deleted file mode 100644 index 6e68263a68f75b97886600785bd0ec8b10e1f999..0000000000000000000000000000000000000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CropHarvester.class.uniqueId0 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/FreezePlayer.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/FreezePlayer.class.uniqueId1 new file mode 100644 index 0000000000000000000000000000000000000000..ec7c978a1e87e3bbd26ead539eaa99b8663ecc93 Binary files /dev/null and b/build/tmp/compileJava/compileTransaction/stash-dir/FreezePlayer.class.uniqueId1 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId3 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId1 rename to build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId3 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Plots.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/Plots.class.uniqueId2 new file mode 100644 index 0000000000000000000000000000000000000000..5a7553abf3b3a69aa83b6ad3229e0b18b99ecfb0 Binary files /dev/null and b/build/tmp/compileJava/compileTransaction/stash-dir/Plots.class.uniqueId2 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Timber$1.class.uniqueId4 b/build/tmp/compileJava/compileTransaction/stash-dir/Timber$1.class.uniqueId4 new file mode 100644 index 0000000000000000000000000000000000000000..6e1f678fcaf2e34428da57720d90a42ce6504652 Binary files /dev/null and b/build/tmp/compileJava/compileTransaction/stash-dir/Timber$1.class.uniqueId4 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Timber.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/Timber.class.uniqueId0 new file mode 100644 index 0000000000000000000000000000000000000000..87340a79a66795d038bb393da94b0d560262d456 Binary files /dev/null and b/build/tmp/compileJava/compileTransaction/stash-dir/Timber.class.uniqueId0 differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index d9178ebccaa1204a80849e52d2b5e24a4341b935..bf859baacfb5aac0dab2afbab8274d3afb722f47 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/FunAndElse/FreezePlayer.java b/src/main/java/FunAndElse/FreezePlayer.java index d39429d226426981129ae39ab6f95d3de486b78e..f9a9b3fd6096b359106f04342c2c055c39f96834 100644 --- a/src/main/java/FunAndElse/FreezePlayer.java +++ b/src/main/java/FunAndElse/FreezePlayer.java @@ -41,7 +41,7 @@ public class FreezePlayer implements Listener,CommandExecutor { Player tmp = Bukkit.getPlayer(args[0]); - if(sender.hasPermission("pixelcampusessentials.freeze")){ + if(sender.hasPermission("pixelcampusessentials.admin")){ if(tmp==null){ sender.sendMessage(ChatColor.RED + "Player not found"); diff --git a/src/main/java/FunAndElse/KeepOutOfFlying.java b/src/main/java/FunAndElse/KeepOutOfFlying.java index 05e4e646cc24ff84a175a32936534d1adfb36bfa..23e273c0291d75abf83fe3db48e442733e6aadb5 100644 --- a/src/main/java/FunAndElse/KeepOutOfFlying.java +++ b/src/main/java/FunAndElse/KeepOutOfFlying.java @@ -1,5 +1,7 @@ package FunAndElse; +import org.bukkit.GameMode; +import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; @@ -9,7 +11,12 @@ public class KeepOutOfFlying implements Listener { @EventHandler public void playerJoin(PlayerJoinEvent e){ + Player player = e.getPlayer(); - + if(player.hasPermission("pixelcampusessentials.admin"))return; + + if(player.getGameMode().equals(GameMode.SURVIVAL) || player.getGameMode().equals(GameMode.ADVENTURE)){ + player.setFlying(false); + } } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7e183c965cfd53900e10fd4f8ea88cc847b555d7..c311b2f140427c839937b7f203c07b22715c8899 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -23,6 +23,9 @@ commands: permission-message: '§cYou dont have Permissions to view Player stats' aliases: [stats] permissions: + pixelcampusessentials.admin: + description: All Op related + default: op pixelcampusessentials.ladder: description: speed ladder default: op