Upstream
/
RandomTeleport
mirror of https://github.com/Phoenix616/RandomTeleport.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Require 1.13

This commit is contained in:
Phoenix616 2020-04-17 23:31:45 +01:00
parent 25efe36b6c
commit 0c35fe9bb9
4 changed files with 64 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -52,7 +52,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version> <version>1.13.2-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
randomteleport-plugin/src/main/java/de/themoep/randomteleport/RandomTeleport.java
View File

@ -362,7 +362,7 @@ public class RandomTeleport extends JavaPlugin implements RandomTeleportAPI {
if (e instanceof Player) { if (e instanceof Player) {
Location belowLoc = targetLoc.clone().subtract(0, 1, 0); Location belowLoc = targetLoc.clone().subtract(0, 1, 0);
Block belowBlock = belowLoc.getBlock(); Block belowBlock = belowLoc.getBlock();
((Player) e).sendBlockChange(belowLoc, belowBlock.getType(), belowBlock.getData()); ((Player) e).sendBlockChange(belowLoc, belowBlock.getBlockData());
} }
targetLoc.setX(targetLoc.getBlockX() + 0.5); targetLoc.setX(targetLoc.getBlockX() + 0.5);
targetLoc.setY(targetLoc.getY() + 0.1); targetLoc.setY(targetLoc.getY() + 0.1);

11
randomteleport-plugin/src/main/java/de/themoep/randomteleport/listeners/SignListener.java
View File

@ -47,9 +47,11 @@ public class SignListener implements Listener {
plugin.sendMessage(event.getPlayer(), "sign.no-permission.create", "perm", "randomteleport.sign.create"); plugin.sendMessage(event.getPlayer(), "sign.no-permission.create", "perm", "randomteleport.sign.create");
} else { } else {
String preset = event.getLine(2); String preset = event.getLine(2);
plugin.sendMessage(event.getPlayer(), "sign.created", "preset", preset); if (preset != null) {
if (plugin.getConfig().getString("presets." + preset.toLowerCase()) == null) { plugin.sendMessage(event.getPlayer(), "sign.created", "preset", preset);
plugin.sendMessage(event.getPlayer(), "error.preset-doesnt-exist", "preset", preset); if (plugin.getConfig().getString("presets." + preset.toLowerCase()) == null) {
plugin.sendMessage(event.getPlayer(), "error.preset-doesnt-exist", "preset", preset);
}
} }
} }
} }
@ -72,7 +74,8 @@ public class SignListener implements Listener {
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onSignClick(PlayerInteractEvent event) { public void onSignClick(PlayerInteractEvent event) {
if (event.getHand() == EquipmentSlot.HAND && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType().name().contains("SIGN")) { if (event.getHand() == EquipmentSlot.HAND && event.getAction() == Action.RIGHT_CLICK_BLOCK
&& event.getClickedBlock() != null && event.getClickedBlock().getType().name().contains("SIGN")) {
Sign sign = (Sign) event.getClickedBlock().getState(); Sign sign = (Sign) event.getClickedBlock().getState();
if (plugin.matchesSignVariable(sign.getLine(1))) { if (plugin.matchesSignVariable(sign.getLine(1))) {
String preset = sign.getLine(2).toLowerCase(); String preset = sign.getLine(2).toLowerCase();

76
randomteleport-plugin/src/main/resources/config.yml
View File

@ -6,54 +6,88 @@ debug: true
# Blocks to teleport on in normal mode # Blocks to teleport on in normal mode
save-blocks: save-blocks:
- sand - sand
- sandstone
- gravel - gravel
- dirt - dirt
- grass_block
- coarse_dirt
- podzol
- stone - stone
- granite
- diorite
- andesite
- cobblestone - cobblestone
- ender_stone - end_stone
- netherrack - netherrack
# Blocks unsave when in "--force blocks" mode # Blocks unsave when in "--force blocks" mode
unsave-blocks: unsave-blocks:
- air - air
- water - water
- stationary_water
- lava - lava
- stationary_lava - oak_sapling
- sapling - spruce_sapling
- bed_block - birch_sapling
- jungle_sapling
- acacia_sapling
- dark_oak_sapling
- white_bed
- orange_bed
- magenta_bed
- light_blue_bed
- yellow_bed
- lime_bed
- pink_bed
- gray_bed
- light_gray_bed
- cyan_bed
- purple_bed
- blue_bed
- brown_bed
- green_bed
- red_bed
- black_bed
- powered_rail - powered_rail
- detector_rail - detector_rail
- web - cobweb
- piston_extension - piston_head
- tnt - tnt
- torch - torch
- fire - fire
- sign_post - sign
- wooden_door
- ladder - ladder
- rails - rail
- wall_sign - wall_sign
- lever - lever
- stone_plate - stone_pressure_plate
- iron_door_block - iron_door
- redstone_torch_off - redstone_wall_torch
- redstone_torch_on - redstone_torch
- stone_button - stone_button
- cactus - cactus
- magma - magma_block
- portal - nether_portal
- vine - vine
- ender_portal - end_portal
- end_portal_frame
- tripwire_hook - tripwire_hook
- tripwire - tripwire
- wood_button
- flower_pot - flower_pot
- leaves - oak_leaves
- leaves_2 - spruce_leaves
- birch_leaves
- jungle_leaves
- acacia_leaves
- dark_oak_leaves
- barrier - barrier
- iron_trapdoor - iron_trapdoor
- wall_banner - oak_trapdoor
- spruce_trapdoor
- birch_trapdoor
- jungle_trapdoor
- acacia_trapdoor
- dark_oak_trapdoor
- oak_door
- spruce_door - spruce_door
- birch_door - birch_door
- jungle_door - jungle_door