Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed additions where at least one operand was not casted as double

This commit is contained in:
Florian CUNY 2019-02-02 10:47:59 +01:00
parent ce025cc49f
commit f2078aae3f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java
View File

@ -11,6 +11,7 @@ import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.util.Vector;
import org.eclipse.jdt.annotation.Nullable;
import world.bentobox.bentobox.BStats;
import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.events.IslandBaseEvent;
@ -71,7 +72,6 @@ public class NewIsland {
/**
* Build a new island for a player
* @author tastybento
*
*/
public static class Builder {
private Island oldIsland2;
@ -232,11 +232,14 @@ public class NewIsland {
* Get the location of next free island spot
* @return Location of island spot or null if one cannot be found
*/
@Nullable
private Location getNextIsland() {
Location last = plugin.getIslands().getLast(world);
if (last == null) {
last = new Location(world, plugin.getIWM().getIslandXOffset(world) + plugin.getIWM().getIslandStartX(world),
plugin.getIWM().getIslandHeight(world), plugin.getIWM().getIslandZOffset(world) + plugin.getIWM().getIslandStartZ(world));
last = new Location(world,
(double) plugin.getIWM().getIslandXOffset(world) + plugin.getIWM().getIslandStartX(world),
plugin.getIWM().getIslandHeight(world),
(double) plugin.getIWM().getIslandZOffset(world) + plugin.getIWM().getIslandStartZ(world));
}
// Find a free spot
Map<Result, Integer> result = new EnumMap<>(Result.class);

2
src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java
View File

@ -306,7 +306,7 @@ public class SafeSpotTeleport {
}
private boolean safe(ChunkSnapshot chunk, int x, int y, int z, World world) {
Vector newSpot = new Vector((chunk.getX() << 4) + x + 0.5D, y + 1, (chunk.getZ() << 4) + z + 0.5D);
Vector newSpot = new Vector((chunk.getX() << 4) + x + 0.5D, y + 1.0D, (chunk.getZ() << 4) + z + 0.5D);
if (portal) {
if (bestSpot == null) {
// Stash the best spot