Skip to content

Commit c6ff5bb

Browse files
committed
Minor code style changes
- Updated FakeEntity and FakeImage classes - Updated Internals class
1 parent 25d5a33 commit c6ff5bb

File tree

3 files changed

+21
-23
lines changed

3 files changed

+21
-23
lines changed

src/main/java/io/josemmo/bukkit/plugin/renderer/FakeEntity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ protected static void tryToSendPacket(@NotNull Player player, @NotNull PacketCon
8888
if (NETWORK_MANAGER_INJECTOR == null) { // Use single-threaded packet sending if reflection failed
8989
CONNECTION.sendServerPacket(player, packet);
9090
} else { // Use non-blocking packet sending if available (faster, the expected case)
91-
NETWORK_MANAGER_INJECTOR.getInjector(player).sendClientboundPacket(packet.getHandle(), null, false);
91+
NETWORK_MANAGER_INJECTOR.getInjector(player).sendClientboundPacket(
92+
packet.getHandle(),
93+
null,
94+
false
95+
);
9296
}
9397
} catch (IllegalStateException e) {
9498
// Server is shutting down and cannot send the packet, ignore

src/main/java/io/josemmo/bukkit/plugin/renderer/FakeImage.java

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -444,24 +444,19 @@ public void spawn(@NotNull Player player) {
444444
* @param player Player instance
445445
*/
446446
private void spawnOnceLoaded(@NotNull Player player) {
447-
try {
448-
String playerName = player.getName();
449-
observingPlayers.add(player);
450-
451-
// Prepare packets to send
452-
List<PacketContainer> packets = new ArrayList<>();
453-
for (FakeItemFrame frame : frames) {
454-
packets.add(frame.getSpawnPacket());
455-
packets.addAll(frame.getRenderPackets(player, 0));
456-
LOGGER.fine("Spawned FakeItemFrame#" + frame.getId() + " for Player#" + playerName);
457-
}
447+
String playerName = player.getName();
448+
observingPlayers.add(player);
449+
450+
// Prepare packets to send
451+
List<PacketContainer> packets = new ArrayList<>();
452+
for (FakeItemFrame frame : frames) {
453+
packets.add(frame.getSpawnPacket());
454+
packets.addAll(frame.getRenderPackets(player, 0));
455+
LOGGER.fine("Spawned FakeItemFrame#" + frame.getId() + " for Player#" + playerName);
456+
}
458457

459-
// Send packets
460-
tryToSendPackets(player, packets);
461-
} catch (Exception e) {
462-
// We should log errors and don't just let the default thread exception handler silence them
463-
e.printStackTrace();
464-
}
458+
// Send packets
459+
tryToSendPackets(player, packets);
465460
}
466461

467462
/**

src/main/java/io/josemmo/bukkit/plugin/utils/Internals.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22

33
import java.lang.reflect.Field;
44
import java.lang.reflect.Method;
5-
65
import org.bukkit.Bukkit;
76
import org.bukkit.Server;
87
import org.bukkit.command.CommandMap;
98
import org.bukkit.command.CommandSender;
109
import org.jetbrains.annotations.NotNull;
1110
import org.jetbrains.annotations.Nullable;
12-
1311
import com.comphenix.protocol.reflect.FuzzyReflection;
1412
import com.comphenix.protocol.utility.MinecraftReflection;
1513
import com.mojang.brigadier.CommandDispatcher;
@@ -36,9 +34,10 @@ public class Internals {
3634

3735
// Get "net.minecraft.server.CommandDispatcher" references
3836
Class<?> nmsDispatcherClass = MinecraftReflection.getMinecraftClass(
39-
/*spigot (1.16.x)*/"CommandDispatcher",
40-
/*spigot*/"commands.CommandDispatcher",
41-
/*mojang/paper*/"commands.Commands");
37+
"CommandDispatcher", // Spigot <1.17
38+
"commands.CommandDispatcher", // Spigot >=1.17
39+
"commands.Commands" // PaperMC
40+
);
4241
Object nmsDispatcherInstance = FuzzyReflection.fromObject(nmsServerInstance, true)
4342
.getMethodByReturnTypeAndParameters("getDispatcher", nmsDispatcherClass)
4443
.invoke(nmsServerInstance);

0 commit comments

Comments
 (0)