PandacubeFr/ChairsReloaded
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass proper block as occupied block

Browse Source
This commit is contained in:
Shevchik 2014-03-07 20:22:25 +04:00
parent 15b3a5a4bd
commit 613f1e7b41
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/cnaude/chairs/core/PlayerSitData.java
View File

@ -32,19 +32,18 @@ public class PlayerSitData {
return Bukkit.getPlayerExact(sitblock.get(chair)); return Bukkit.getPlayerExact(sitblock.get(chair));
} }
public void sitPlayer(Player player, Location sitlocation) { public void sitPlayer(Player player, Block blocktooccupy, Location sitlocation) {
try { try {
if (plugin.notifyplayer) { if (plugin.notifyplayer) {
player.sendMessage(plugin.msgSitting); player.sendMessage(plugin.msgSitting);
} }
Block block = sitlocation.getBlock();
sitstopteleportloc.put(player.getName(), player.getLocation()); sitstopteleportloc.put(player.getName(), player.getLocation());
player.teleport(sitlocation); player.teleport(sitlocation);
Location arrowloc = block.getLocation().add(0.5, 0 , 0.5); Location arrowloc = sitlocation.getBlock().getLocation().add(0.5, 0 , 0.5);
Entity arrow = plugin.getNMSAccess().spawnArrow(arrowloc); Entity arrow = plugin.getNMSAccess().spawnArrow(arrowloc);
arrow.setPassenger(player); arrow.setPassenger(player);
sit.put(player.getName(), arrow); sit.put(player.getName(), arrow);
sitblock.put(block, player.getName()); sitblock.put(blocktooccupy, player.getName());
startReSitTask(player); startReSitTask(player);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

2
src/com/cnaude/chairs/listeners/TrySitEventListener.java
View File

@ -39,7 +39,7 @@ public class TrySitEventListener implements Listener {
if (sitAllowed(player, block)) { if (sitAllowed(player, block)) {
event.setCancelled(true); event.setCancelled(true);
Location sitLocation = getSitLocation(block, player.getLocation().getYaw()); Location sitLocation = getSitLocation(block, player.getLocation().getYaw());
plugin.getPlayerSitData().sitPlayer(player, sitLocation); plugin.getPlayerSitData().sitPlayer(player, block, sitLocation);
} }
} }
} }