68 lines
4.6 KiB
Diff
68 lines
4.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Tue, 15 Aug 2017 22:29:12 -0400
|
||
|
|
Subject: [PATCH] Expand World.spawnParticle API and add Builder
|
||
|
|
|
||
|
|
Adds ability to control who receives it and who is the source/sender (vanish API)
|
||
|
|
the standard API is to send the packet to everyone in the world, which is ineffecient.
|
||
|
|
Adds an option to control the force mode of the particle.
|
||
|
|
|
||
|
|
This adds a new Builder API which is much friendlier to use.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
index 20650bfd10abfa010e71cfeede06c461d50d19a3..5110f2c70d96284e8e7592b3d89266b867b9a466 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
@@ -164,7 +164,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
public final Int2ObjectMap<Entity> entitiesById = new Int2ObjectLinkedOpenHashMap();
|
||
|
|
private final Map<UUID, Entity> entitiesByUuid = Maps.newHashMap();
|
||
|
|
private final Queue<Entity> toAddAfterTick = Queues.newArrayDeque();
|
||
|
|
- private final List<ServerPlayer> players = Lists.newArrayList();
|
||
|
|
+ public final List<ServerPlayer> players = Lists.newArrayList(); // Paper - private -> public
|
||
|
|
public final ServerChunkCache chunkSource; // Paper - public
|
||
|
|
boolean tickingEntities;
|
||
|
|
private final MinecraftServer server;
|
||
|
|
@@ -1472,12 +1472,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
}
|
||
|
|
|
||
|
|
public <T extends ParticleOptions> int sendParticles(ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
|
||
|
|
+ // Paper start - Particle API Expansion
|
||
|
|
+ return sendParticles(players, sender, t0, d0, d1, d2, i, d3, d4, d5, d6, force);
|
||
|
|
+ }
|
||
|
|
+ public <T extends ParticleOptions> int sendParticles(List<ServerPlayer> receivers, ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
|
||
|
|
+ // Paper end
|
||
|
|
ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(t0, force, d0, d1, d2, (float) d3, (float) d4, (float) d5, (float) d6, i);
|
||
|
|
// CraftBukkit end
|
||
|
|
int j = 0;
|
||
|
|
|
||
|
|
- for (int k = 0; k < this.players.size(); ++k) {
|
||
|
|
- ServerPlayer entityplayer = (ServerPlayer) this.players.get(k);
|
||
|
|
+ for (Player entityhuman : receivers) { // Paper - Particle API Expansion
|
||
|
|
+ ServerPlayer entityplayer = (ServerPlayer) entityhuman; // Paper - Particle API Expansion
|
||
|
|
if (sender != null && !entityplayer.getBukkitEntity().canSee(sender.getBukkitEntity())) continue; // CraftBukkit
|
||
|
|
|
||
|
|
if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
index 88658d4deacc29128c537e2e02fdc8f684090a2c..beb7219312be5143a50b0841c25efea5dbcc1267 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
@@ -2334,11 +2334,17 @@ public class CraftWorld implements World {
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
|
||
|
|
+ // Paper start - Particle API Expansion
|
||
|
|
+ spawnParticle(particle, null, null, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, force);
|
||
|
|
+ }
|
||
|
|
+ public <T> void spawnParticle(Particle particle, List<Player> receivers, Player sender, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
|
||
|
|
+ // Paper end
|
||
|
|
if (data != null && !particle.getDataType().isInstance(data)) {
|
||
|
|
throw new IllegalArgumentException("data should be " + particle.getDataType() + " got " + data.getClass());
|
||
|
|
}
|
||
|
|
getHandle().sendParticles(
|
||
|
|
- null, // Sender
|
||
|
|
+ receivers == null ? getHandle().players : receivers.stream().map(player -> ((CraftPlayer) player).getHandle()).collect(java.util.stream.Collectors.toList()), // Paper - Particle API Expansion
|
||
|
|
+ sender != null ? ((CraftPlayer) sender).getHandle() : null, // Sender // Paper - Particle API Expansion
|
||
|
|
CraftParticle.toNMS(particle, data), // Particle
|
||
|
|
x, y, z, // Position
|
||
|
|
count, // Count
|