Skip to content

Commit 2215bab

Browse files
committed
Fix compile issue for particle in CraftWorld
1 parent 851208a commit 2215bab

2 files changed

Lines changed: 31 additions & 10 deletions

File tree

‎paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@
11641164
}
11651165

11661166
public <T extends ParticleOptions> int sendParticles(
1167-
@@ -1450,6 +_,49 @@
1167+
@@ -1450,6 +_,68 @@
11681168
final double zSpeed,
11691169
final ClientboundLevelParticlesPacket.RandomizationType randomizationType
11701170
) {
@@ -1205,6 +1205,25 @@
12051205
+ final double xDist,
12061206
+ final double yDist,
12071207
+ final double zDist,
1208+
+ final double speed,
1209+
+ final ClientboundLevelParticlesPacket.RandomizationType randomizationType
1210+
+ ) {
1211+
+ return this.sendParticlesSource(receivers, sender, particle, overrideLimiter, alwaysShow, x, y, z, count, xDist, yDist, zDist, speed, speed, speed, randomizationType);
1212+
+ }
1213+
+
1214+
+ public <T extends ParticleOptions> int sendParticlesSource(
1215+
+ final List<ServerPlayer> receivers,
1216+
+ final @Nullable Entity sender,
1217+
+ final T particle,
1218+
+ final boolean overrideLimiter,
1219+
+ final boolean alwaysShow,
1220+
+ final double x,
1221+
+ final double y,
1222+
+ final double z,
1223+
+ final int count,
1224+
+ final double xDist,
1225+
+ final double yDist,
1226+
+ final double zDist,
12081227
+ final double xSpeed,
12091228
+ final double ySpeed,
12101229
+ final double zSpeed,

‎paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import net.minecraft.core.particles.ParticleTypes;
4444
import net.minecraft.core.registries.Registries;
4545
import net.minecraft.network.protocol.game.ClientboundLevelEventPacket;
46+
import net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket;
4647
import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
4748
import net.minecraft.network.protocol.game.ClientboundSoundPacket;
4849
import net.minecraft.resources.Identifier;
@@ -1756,15 +1757,16 @@ public <T> void spawnParticle(Particle particle, List<Player> receivers, Player
17561757
Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
17571758
}
17581759
this.getHandle().sendParticlesSource(
1759-
receivers == null ? this.getHandle().players() : Lists.transform(receivers, player -> ((CraftPlayer) player).getHandle()), // Paper - Particle API
1760-
sender != null ? ((CraftPlayer) sender).getHandle() : null, // Sender // Paper - Particle API
1761-
CraftParticle.createParticleParam(particle, data), // Particle
1762-
force,
1763-
false,
1764-
x, y, z, // Position
1765-
count, // Count
1766-
offsetX, offsetY, offsetZ, // Random offset
1767-
extra // Speed?
1760+
receivers == null ? this.getHandle().players() : Lists.transform(receivers, player -> ((CraftPlayer) player).getHandle()), // Paper - Particle API
1761+
sender != null ? ((CraftPlayer) sender).getHandle() : null, // Sender // Paper - Particle API
1762+
CraftParticle.createParticleParam(particle, data), // Particle
1763+
force,
1764+
false,
1765+
x, y, z, // Position
1766+
count, // Count
1767+
offsetX, offsetY, offsetZ, // Random offset
1768+
extra, // Speed?
1769+
ClientboundLevelParticlesPacket.RandomizationType.DEFAULT
17681770
);
17691771

17701772
}

0 commit comments

Comments
 (0)