Skip to content

Commit 155e034

Browse files
sh0inxsh0inx
authored
Updated Integer.MAX to Bukkit.getServer().getMaxWorldSize() (#249)
1 parent ab2cb2c commit 155e034

11 files changed

Lines changed: 59 additions & 37 deletions

File tree

‎multiversion/default/src/main/java/com/iridium/iridiumcore/nms/NMSDefault.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.iridium.iridiumcore.nms;
22

3+
import com.cryptomorin.xseries.reflection.XReflection;
34
import com.iridium.iridiumcore.Color;
45
import org.bukkit.*;
56
import org.bukkit.entity.Player;
@@ -13,6 +14,8 @@
1314
*/
1415
public class NMSDefault implements NMS {
1516

17+
int version = XReflection.MAJOR_NUMBER;
18+
1619
/**
1720
* Deletes a block faster than with Spigots implementation.
1821
* See https://www.spigotmc.org/threads/methods-for-changing-massive-amount-of-blocks-up-to-14m-blocks-s.395868/
@@ -56,8 +59,11 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
5659
worldBorder.setCenter(centerLocation.getBlockX() + 0.5, centerLocation.getBlockZ() + 0.5);
5760
}
5861

62+
long max = 20000000L;
63+
if (version >= 17) max = Bukkit.getServer().getMaxWorldSize();
64+
5965
if (color == Color.OFF) {
60-
worldBorder.setSize(Integer.MAX_VALUE);
66+
worldBorder.setSize(max);
6167
} else {
6268
worldBorder.setSize(size);
6369
}
@@ -66,9 +72,9 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
6672
worldBorder.setDamageBuffer(0);
6773

6874
if (color == Color.RED) {
69-
worldBorder.setSize(size - 0.1D, 20000000L);
75+
worldBorder.setSize(size - 0.1D, max);
7076
} else if (color == Color.GREEN) {
71-
worldBorder.setSize(size + 0.1D, 20000000L);
77+
worldBorder.setSize(size + 0.1D, max);
7278
}
7379

7480
player.setWorldBorder(worldBorder);

‎multiversion/v1_17_R1/src/main/java/com/iridium/iridiumcore/nms/NMS_V1_17_R1.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.minecraft.world.level.border.WorldBorder;
1212
import net.minecraft.world.level.chunk.Chunk;
1313
import net.minecraft.world.level.chunk.ChunkSection;
14+
import org.bukkit.Bukkit;
1415
import org.bukkit.ChatColor;
1516
import org.bukkit.Location;
1617
import org.bukkit.craftbukkit.v1_17_R1.CraftChunk;
@@ -80,8 +81,10 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
8081
worldBorder.world = ((CraftWorld) centerLocation.getWorld()).getHandle();
8182
worldBorder.setCenter(centerLocation.getBlockX() + 0.5, centerLocation.getBlockZ() + 0.5);
8283

84+
int max = Bukkit.getServer().getMaxWorldSize();
85+
8386
if (color == Color.OFF) {
84-
worldBorder.setSize(Integer.MAX_VALUE);
87+
worldBorder.setSize(max);
8588
} else {
8689
worldBorder.setSize(size);
8790
}
@@ -90,9 +93,9 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
9093
worldBorder.setWarningTime(0);
9194

9295
if (color == Color.RED) {
93-
worldBorder.transitionSizeBetween(size, size - 1.0D, 20000000L);
96+
worldBorder.transitionSizeBetween(size, size - 1.0D, max);
9497
} else if (color == Color.GREEN) {
95-
worldBorder.transitionSizeBetween(size - 0.1D, size, 20000000L);
98+
worldBorder.transitionSizeBetween(size - 0.1D, size, max);
9699
}
97100

98101
((CraftPlayer) player).getHandle().b.sendPacket(new ClientboundInitializeBorderPacket(worldBorder));

‎multiversion/v1_18_R1/src/main/java/com/iridium/iridiumcore/nms/NMS_V1_18_R1.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket;
55
import net.minecraft.server.MinecraftServer;
66
import net.minecraft.world.level.border.WorldBorder;
7+
import org.bukkit.Bukkit;
78
import org.bukkit.ChatColor;
89
import org.bukkit.Location;
910
import org.bukkit.Material;
@@ -59,8 +60,10 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
5960
worldBorder.world = ((CraftWorld) centerLocation.getWorld()).getHandle();
6061
worldBorder.c(centerLocation.getBlockX() + 0.5, centerLocation.getBlockZ() + 0.5);
6162

63+
int max = Bukkit.getServer().getMaxWorldSize();
64+
6265
if (color == Color.OFF) {
63-
worldBorder.a(Integer.MAX_VALUE);
66+
worldBorder.a(max);
6467
} else {
6568
worldBorder.a(size);
6669
}
@@ -69,9 +72,9 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
6972
worldBorder.c(0);
7073

7174
if (color == Color.RED) {
72-
worldBorder.a(size, size - 1.0D, 20000000L);
75+
worldBorder.a(size, size - 1.0D, max);
7376
} else if (color == Color.GREEN) {
74-
worldBorder.a(size - 0.1D, size, 20000000L);
77+
worldBorder.a(size - 0.1D, size, max);
7578
}
7679

7780
((CraftPlayer) player).getHandle().b.a(new ClientboundInitializeBorderPacket(worldBorder));

‎multiversion/v1_18_R2/src/main/java/com/iridium/iridiumcore/nms/NMS_V1_18_R2.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
66
import net.minecraft.server.MinecraftServer;
77
import net.minecraft.world.level.border.WorldBorder;
8+
import org.bukkit.Bukkit;
89
import org.bukkit.ChatColor;
910
import org.bukkit.Location;
1011
import org.bukkit.Material;
@@ -65,8 +66,10 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
6566
worldBorder.world = ((CraftWorld) centerLocation.getWorld()).getHandle();
6667
worldBorder.c(centerLocation.getBlockX() + 0.5, centerLocation.getBlockZ() + 0.5);
6768

69+
int max = Bukkit.getServer().getMaxWorldSize();
70+
6871
if (color == Color.OFF) {
69-
worldBorder.a(Integer.MAX_VALUE);
72+
worldBorder.a(max);
7073
} else {
7174
worldBorder.a(size);
7275
}
@@ -75,9 +78,9 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
7578
worldBorder.c(0);
7679

7780
if (color == Color.RED) {
78-
worldBorder.a(size, size - 1.0D, 20000000L);
81+
worldBorder.a(size, size - 1.0D, max);
7982
} else if (color == Color.GREEN) {
80-
worldBorder.a(size - 0.1D, size, 20000000L);
83+
worldBorder.a(size - 0.1D, size, max);
8184
}
8285

8386
((CraftPlayer) player).getHandle().b.a(new ClientboundInitializeBorderPacket(worldBorder));

‎multiversion/v1_19_R1/src/main/java/com/iridium/iridiumcore/nms/NMS_V1_19_R1.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
7474
else
7575
worldBorder.setCenter(centerLocation.getBlockX() + 0.5, centerLocation.getBlockZ() + 0.5);
7676

77-
77+
int max = Bukkit.getServer().getMaxWorldSize();
78+
7879
if (color == Color.OFF) {
79-
worldBorder.setSize(Integer.MAX_VALUE);
80+
worldBorder.setSize(max);
8081
} else {
8182
worldBorder.setSize(size);
8283
}
@@ -85,9 +86,9 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
8586
worldBorder.setDamageBuffer(0);
8687

8788
if (color == Color.RED) {
88-
worldBorder.setSize(size - 0.1D, 20000000L);
89+
worldBorder.setSize(size - 0.1D, max);
8990
} else if (color == Color.GREEN) {
90-
worldBorder.setSize( size+0.1D, 20000000L);
91+
worldBorder.setSize( size+0.1D, max);
9192
}
9293

9394
player.setWorldBorder(worldBorder);

‎multiversion/v1_19_R2/src/main/java/com/iridium/iridiumcore/nms/NMS_V1_19_R2.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
7474
else
7575
worldBorder.setCenter(centerLocation.getBlockX() + 0.5, centerLocation.getBlockZ() + 0.5);
7676

77-
77+
int max = Bukkit.getServer().getMaxWorldSize();
78+
7879
if (color == Color.OFF) {
79-
worldBorder.setSize(Integer.MAX_VALUE);
80+
worldBorder.setSize(max);
8081
} else {
8182
worldBorder.setSize(size);
8283
}
@@ -85,9 +86,9 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
8586
worldBorder.setDamageBuffer(0);
8687

8788
if (color == Color.RED) {
88-
worldBorder.setSize(size - 0.1D, 20000000L);
89+
worldBorder.setSize(size - 0.1D, max);
8990
} else if (color == Color.GREEN) {
90-
worldBorder.setSize( size+0.1D, 20000000L);
91+
worldBorder.setSize( size+0.1D, max);
9192
}
9293

9394
player.setWorldBorder(worldBorder);

‎multiversion/v1_19_R3/src/main/java/com/iridium/iridiumcore/nms/NMS_V1_19_R3.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
7474
else
7575
worldBorder.setCenter(centerLocation.getBlockX() + 0.5, centerLocation.getBlockZ() + 0.5);
7676

77+
int max = Bukkit.getServer().getMaxWorldSize();
7778

7879
if (color == Color.OFF) {
79-
worldBorder.setSize(Integer.MAX_VALUE);
80+
worldBorder.setSize(max);
8081
} else {
8182
worldBorder.setSize(size);
8283
}
@@ -85,9 +86,9 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
8586
worldBorder.setDamageBuffer(0);
8687

8788
if (color == Color.RED) {
88-
worldBorder.setSize(size - 0.1D, 20000000L);
89+
worldBorder.setSize(size - 0.1D, max);
8990
} else if (color == Color.GREEN) {
90-
worldBorder.setSize( size+0.1D, 20000000L);
91+
worldBorder.setSize( size+0.1D, max);
9192
}
9293

9394
player.setWorldBorder(worldBorder);

‎multiversion/v1_20_R1/src/main/java/com/iridium/iridiumcore/nms/NMS_V1_20_R1.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
7474
else
7575
worldBorder.setCenter(centerLocation.getBlockX() + 0.5, centerLocation.getBlockZ() + 0.5);
7676

77+
int max = Bukkit.getServer().getMaxWorldSize();
7778

7879
if (color == Color.OFF) {
79-
worldBorder.setSize(Integer.MAX_VALUE);
80+
worldBorder.setSize(max);
8081
} else {
8182
worldBorder.setSize(size);
8283
}
@@ -85,9 +86,9 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
8586
worldBorder.setDamageBuffer(0);
8687

8788
if (color == Color.RED) {
88-
worldBorder.setSize(size - 0.1D, 20000000L);
89+
worldBorder.setSize(size - 0.1D, max);
8990
} else if (color == Color.GREEN) {
90-
worldBorder.setSize( size+0.1D, 20000000L);
91+
worldBorder.setSize( size+0.1D, max);
9192
}
9293

9394
player.setWorldBorder(worldBorder);

‎multiversion/v1_20_R2/src/main/java/com/iridium/iridiumcore/nms/NMS_V1_20_R2.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
7474
else
7575
worldBorder.setCenter(centerLocation.getBlockX() + 0.5, centerLocation.getBlockZ() + 0.5);
7676

77-
77+
int max = Bukkit.getServer().getMaxWorldSize();
78+
7879
if (color == Color.OFF) {
79-
worldBorder.setSize(Integer.MAX_VALUE);
80+
worldBorder.setSize(max);
8081
} else {
8182
worldBorder.setSize(size);
8283
}
@@ -85,9 +86,9 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
8586
worldBorder.setDamageBuffer(0);
8687

8788
if (color == Color.RED) {
88-
worldBorder.setSize(size - 0.1D, 20000000L);
89+
worldBorder.setSize(size - 0.1D, max);
8990
} else if (color == Color.GREEN) {
90-
worldBorder.setSize( size+0.1D, 20000000L);
91+
worldBorder.setSize( size+0.1D, max);
9192
}
9293

9394
player.setWorldBorder(worldBorder);

‎multiversion/v1_20_R3/src/main/java/com/iridium/iridiumcore/nms/NMS_V1_20_R3.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
7474
else
7575
worldBorder.setCenter(centerLocation.getBlockX() + 0.5, centerLocation.getBlockZ() + 0.5);
7676

77+
int max = Bukkit.getServer().getMaxWorldSize();
7778

7879
if (color == Color.OFF) {
79-
worldBorder.setSize(Integer.MAX_VALUE);
80+
worldBorder.setSize(max);
8081
} else {
8182
worldBorder.setSize(size);
8283
}
@@ -85,9 +86,9 @@ public void sendWorldBorder(Player player, Color color, double size, Location ce
8586
worldBorder.setDamageBuffer(0);
8687

8788
if (color == Color.RED) {
88-
worldBorder.setSize(size - 0.1D, 20000000L);
89+
worldBorder.setSize(size - 0.1D, max);
8990
} else if (color == Color.GREEN) {
90-
worldBorder.setSize( size+0.1D, 20000000L);
91+
worldBorder.setSize( size+0.1D, max);
9192
}
9293

9394
player.setWorldBorder(worldBorder);

0 commit comments

Comments
 (0)