2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-05-01 02:32:15 +02:00
|
|
|
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.
|
2018-08-14 07:42:31 +02:00
|
|
|
Adds an option to control the force mode of the particle.
|
2018-05-01 02:32:15 +02:00
|
|
|
|
|
|
|
This adds a new Builder API which is much friendlier to use.
|
|
|
|
|
2021-03-16 08:19:45 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
|
2021-04-07 07:17:32 +02:00
|
|
|
index 6137a88e1dc8d19a4e35ad97500dabeddba008a8..96d67fc3cbe61c1fb6e639b1838b2fd198c3f3d5 100644
|
2021-03-16 08:19:45 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
|
|
|
|
@@ -170,7 +170,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
2019-05-06 02:57:14 +02:00
|
|
|
public final Int2ObjectMap<Entity> entitiesById = new Int2ObjectLinkedOpenHashMap();
|
|
|
|
private final Map<UUID, Entity> entitiesByUUID = Maps.newHashMap();
|
|
|
|
private final Queue<Entity> entitiesToAdd = Queues.newArrayDeque();
|
|
|
|
- private final List<EntityPlayer> players = Lists.newArrayList();
|
|
|
|
+ public final List<EntityPlayer> players = Lists.newArrayList(); // Paper - private -> public
|
2020-06-25 16:09:55 +02:00
|
|
|
public final ChunkProviderServer chunkProvider; // Paper - public
|
2019-05-06 02:57:14 +02:00
|
|
|
boolean tickingEntities;
|
|
|
|
private final MinecraftServer server;
|
2021-04-07 07:17:32 +02:00
|
|
|
@@ -1479,12 +1479,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
2018-05-01 02:32:15 +02:00
|
|
|
}
|
2018-08-26 20:11:49 +02:00
|
|
|
|
|
|
|
public <T extends ParticleParam> int sendParticles(EntityPlayer 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);
|
2018-05-01 02:32:15 +02:00
|
|
|
+ }
|
2019-05-06 02:57:14 +02:00
|
|
|
+ public <T extends ParticleParam> int sendParticles(List<EntityPlayer> receivers, EntityPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
|
2018-08-14 17:26:01 +02:00
|
|
|
+ // Paper end
|
2019-12-12 00:43:22 +01:00
|
|
|
PacketPlayOutWorldParticles packetplayoutworldparticles = new PacketPlayOutWorldParticles(t0, force, d0, d1, d2, (float) d3, (float) d4, (float) d5, (float) d6, i);
|
2018-08-26 20:11:49 +02:00
|
|
|
// CraftBukkit end
|
2018-07-19 01:16:19 +02:00
|
|
|
int j = 0;
|
2018-05-01 02:32:15 +02:00
|
|
|
|
2018-07-19 01:16:19 +02:00
|
|
|
- for (int k = 0; k < this.players.size(); ++k) {
|
|
|
|
- EntityPlayer entityplayer = (EntityPlayer) this.players.get(k);
|
2018-05-01 02:32:15 +02:00
|
|
|
+ for (EntityHuman entityhuman : receivers) { // Paper - Particle API Expansion
|
|
|
|
+ EntityPlayer entityplayer = (EntityPlayer) entityhuman; // Paper - Particle API Expansion
|
|
|
|
if (sender != null && !entityplayer.getBukkitEntity().canSee(sender.getBukkitEntity())) continue; // CraftBukkit
|
2018-07-19 01:16:19 +02:00
|
|
|
|
2018-08-26 20:11:49 +02:00
|
|
|
if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
|
2018-05-01 02:32:15 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2021-04-18 09:52:36 +02:00
|
|
|
index 2513e9a5b66598337f5d380a036ee10fdbab38c3..3855b8264d3223f3b1609a3cb81e009b1cd61268 100644
|
2018-05-01 02:32:15 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2021-04-18 09:52:36 +02:00
|
|
|
@@ -2352,11 +2352,17 @@ public class CraftWorld implements World {
|
2018-05-01 02:32:15 +02:00
|
|
|
|
|
|
|
@Override
|
2018-08-26 20:11:49 +02:00
|
|
|
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);
|
|
|
|
+ }
|
2018-08-14 07:42:31 +02:00
|
|
|
+ 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) {
|
2018-05-01 02:32:15 +02:00
|
|
|
+ // 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
|
2018-07-19 01:16:19 +02:00
|
|
|
CraftParticle.toNMS(particle, data), // Particle
|
2018-05-01 02:32:15 +02:00
|
|
|
x, y, z, // Position
|
2018-07-19 01:16:19 +02:00
|
|
|
count, // Count
|