Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-15 12:02:57 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-6249: Add Missing Effect Constants

Browse Source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2021-09-11 18:40:14 +10:00
parent 4d34ac117b
commit 4495b9ec5b
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
paper-server/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
View File

@ -3,6 +3,7 @@ package org.bukkit.craftbukkit;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.Axis;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.Material; import org.bukkit.Material;
@ -61,6 +62,31 @@ public class CraftEffect {
Validate.isTrue(((Material) data).isBlock(), "Material is not a block!"); Validate.isTrue(((Material) data).isBlock(), "Material is not a block!");
datavalue = Block.getCombinedId(CraftMagicNumbers.getBlock((Material) data).getBlockData()); datavalue = Block.getCombinedId(CraftMagicNumbers.getBlock((Material) data).getBlockData());
break; break;
case COMPOSTER_FILL_ATTEMPT:
datavalue = ((Boolean) data) ? 1 : 0;
break;
case BONE_MEAL_USE:
datavalue = (Integer) data;
break;
case ELECTRIC_SPARK:
if (data == null) {
datavalue = -1;
} else {
switch ((Axis) data) {
case X:
datavalue = 0;
break;
case Y:
datavalue = 1;
break;
case Z:
datavalue = 2;
break;
default:
throw new IllegalArgumentException("Bad electric spark axis!");
}
}
break;
default: default:
datavalue = 0; datavalue = 0;
} }

5
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -1091,10 +1091,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
if (data != null) { if (data != null) {
Validate.isTrue(effect.getData() != null && effect.getData().isAssignableFrom(data.getClass()), "Wrong kind of data for this effect!"); Validate.isTrue(effect.getData() != null && effect.getData().isAssignableFrom(data.getClass()), "Wrong kind of data for this effect!");
} else { } else {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); // Special case: the axis is optional for ELECTRIC_SPARK
Validate.isTrue(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for this effect!");
} }
int datavalue = data == null ? 0 : CraftEffect.getDataValue(effect, data); int datavalue = CraftEffect.getDataValue(effect, data);
playEffect(loc, effect, datavalue, radius); playEffect(loc, effect, datavalue, radius);
} }

5
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -527,10 +527,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (data != null) { if (data != null) {
Validate.isTrue(effect.getData() != null && effect.getData().isAssignableFrom(data.getClass()), "Wrong kind of data for this effect!"); Validate.isTrue(effect.getData() != null && effect.getData().isAssignableFrom(data.getClass()), "Wrong kind of data for this effect!");
} else { } else {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); // Special case: the axis is optional for ELECTRIC_SPARK
Validate.isTrue(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for this effect!");
} }
int datavalue = data == null ? 0 : CraftEffect.getDataValue(effect, data); int datavalue = CraftEffect.getDataValue(effect, data);
playEffect(loc, effect, datavalue); playEffect(loc, effect, datavalue);
} }