Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

fix(radius) - gmfamily - process radius as int everywhere (#3478)

Browse source
This commit is contained in:
gmfamily 2021-09-18 19:47:46 +02:00
parent ecbc7a0294
commit 827e99be00
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DynmapCore/src/main/java/org/dynmap/DynmapMapCommands.java
View file

@ -158,7 +158,7 @@ public class DynmapMapCommands {
VisibilityLimit limit = w.visibility_limits.get(i); VisibilityLimit limit = w.visibility_limits.get(i);
if (limit instanceof RoundVisibilityLimit) { if (limit instanceof RoundVisibilityLimit) {
RoundVisibilityLimit rlimit = (RoundVisibilityLimit) limit; RoundVisibilityLimit rlimit = (RoundVisibilityLimit) limit;
sender.sendMessage(String.format(" %d: limittype=visible, type=round, center=%d/%d, radius=%f", i, rlimit.x_center, rlimit.z_center, rlimit.radius)); sender.sendMessage(String.format(" %d: limittype=visible, type=round, center=%d/%d, radius=%d", i, rlimit.x_center, rlimit.z_center, rlimit.radius));
} }
else if (limit instanceof RectangleVisibilityLimit) { else if (limit instanceof RectangleVisibilityLimit) {
RectangleVisibilityLimit rlimit = (RectangleVisibilityLimit) limit; RectangleVisibilityLimit rlimit = (RectangleVisibilityLimit) limit;
@ -171,7 +171,7 @@ public class DynmapMapCommands {
VisibilityLimit limit = w.hidden_limits.get(i); VisibilityLimit limit = w.hidden_limits.get(i);
if (limit instanceof RoundVisibilityLimit) { if (limit instanceof RoundVisibilityLimit) {
RoundVisibilityLimit rlimit = (RoundVisibilityLimit) limit; RoundVisibilityLimit rlimit = (RoundVisibilityLimit) limit;
sender.sendMessage(String.format(" %d: limittype=hidden, type=round, center=%d/%d, radius=%f", i + viscnt, rlimit.x_center, rlimit.z_center, rlimit.radius)); sender.sendMessage(String.format(" %d: limittype=hidden, type=round, center=%d/%d, radius=%d", i + viscnt, rlimit.x_center, rlimit.z_center, rlimit.radius));
} }
else if (limit instanceof RectangleVisibilityLimit) { else if (limit instanceof RectangleVisibilityLimit) {
RectangleVisibilityLimit rlimit = (RectangleVisibilityLimit) limit; RectangleVisibilityLimit rlimit = (RectangleVisibilityLimit) limit;
@ -205,7 +205,7 @@ public class DynmapMapCommands {
int corner1[] = null; int corner1[] = null;
int corner2[] = null; int corner2[] = null;
int center[] = null; int center[] = null;
double radius = 0.0; int radius = 0;
HiddenChunkStyle style = null; HiddenChunkStyle style = null;
// Other args are field:value // Other args are field:value
for (int argid = 2; argid < args.length; argid++) { for (int argid = 2; argid < args.length; argid++) {

4
DynmapCore/src/main/java/org/dynmap/utils/RoundVisibilityLimit.java
View file

@ -2,9 +2,9 @@ package org.dynmap.utils;
public class RoundVisibilityLimit implements VisibilityLimit { public class RoundVisibilityLimit implements VisibilityLimit {
public int x_center, z_center; public int x_center, z_center;
public double radius; //Using squared_radius instead of radius for tiny optimization public int radius; //Using squared_radius instead of radius for tiny optimization
public RoundVisibilityLimit(int x_center, int z_center, double radius) { public RoundVisibilityLimit(int x_center, int z_center, int radius) {
this.x_center = x_center; this.x_center = x_center;
this.z_center = z_center; this.z_center = z_center;
this.radius = radius; this.radius = radius;