Update paperweight to 1.5.9 (#9872)
This commit is contained in:
parent
acc6d012b0
commit
b974a6b6f3
104 changed files with 605 additions and 639 deletions
|
@ -88,36 +88,6 @@ index 95a5ce711150c4c999a9d17f28a497f034638610..214215d203892b8009595539f25ce26e
|
|||
private LootContextParamSet paramSet;
|
||||
private Optional<ResourceLocation> randomSequence;
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftParticle.java b/src/main/java/org/bukkit/craftbukkit/CraftParticle.java
|
||||
index 8a7d1c7b214a29f1364f42c1eb0aa89d0e3e4b41..af88ca7eaf94dc52d4b9dd96ffc8f8c956230812 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftParticle.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftParticle.java
|
||||
@@ -113,7 +113,7 @@ public abstract class CraftParticle<D> implements Keyed {
|
||||
private static final BiFunction<NamespacedKey, net.minecraft.core.particles.ParticleType<?>, CraftParticle<?>> VOID_FUNCTION = (name, particle) -> new CraftParticle<>(name, particle, Void.class) {
|
||||
@Override
|
||||
public ParticleOptions createParticleParam(Void data) {
|
||||
- return (SimpleParticleType) CraftParticle.this.getHandle();
|
||||
+ return (SimpleParticleType) this.getHandle(); // Paper - fix?
|
||||
}
|
||||
};
|
||||
|
||||
@@ -129,14 +129,14 @@ public abstract class CraftParticle<D> implements Keyed {
|
||||
BiFunction<NamespacedKey, net.minecraft.core.particles.ParticleType<?>, CraftParticle<?>> itemStackFunction = (name, particle) -> new CraftParticle<>(name, particle, ItemStack.class) {
|
||||
@Override
|
||||
public ParticleOptions createParticleParam(ItemStack data) {
|
||||
- return new ItemParticleOption((net.minecraft.core.particles.ParticleType<ItemParticleOption>) CraftParticle.this.getHandle(), CraftItemStack.asNMSCopy(data));
|
||||
+ return new ItemParticleOption((net.minecraft.core.particles.ParticleType<ItemParticleOption>) this.getHandle(), CraftItemStack.asNMSCopy(data)); // Paper - fix?
|
||||
}
|
||||
};
|
||||
|
||||
BiFunction<NamespacedKey, net.minecraft.core.particles.ParticleType<?>, CraftParticle<?>> blockDataFunction = (name, particle) -> new CraftParticle<>(name, particle, BlockData.class) {
|
||||
@Override
|
||||
public ParticleOptions createParticleParam(BlockData data) {
|
||||
- return new BlockParticleOption((net.minecraft.core.particles.ParticleType<BlockParticleOption>) CraftParticle.this.getHandle(), ((CraftBlockData) data).getState());
|
||||
+ return new BlockParticleOption((net.minecraft.core.particles.ParticleType<BlockParticleOption>) this.getHandle(), ((CraftBlockData) data).getState()); // Paper - fix?
|
||||
}
|
||||
};
|
||||
|
||||
diff --git a/src/test/java/org/bukkit/DyeColorsTest.java b/src/test/java/org/bukkit/DyeColorsTest.java
|
||||
index b70450722da13bc4d358a70d3d1d2f30a2cca2b9..86d86c292bdeeb7f42685691287c3b4bd476ea14 100644
|
||||
--- a/src/test/java/org/bukkit/DyeColorsTest.java
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue