SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-5748: Add instant effect potion break to the Effect enum

Browse Source 
Conversion from Color to integer for the data of the new enum entry

By: WinX64 <winx64b@hotmail.com>
This commit is contained in:
CraftBukkit/Spigot
2020-05-26 19:34:39 +10:00
parent 809449f545
commit edf9390114
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package org.bukkit.craftbukkit;
import net.minecraft.server.Block; import net.minecraft.server.Block;
import net.minecraft.server.Item; import net.minecraft.server.Item;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.Color;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
@@ -19,6 +20,9 @@ public class CraftEffect {
case POTION_BREAK: case POTION_BREAK:
datavalue = ((Potion) data).toDamageValue() & 0x3F; datavalue = ((Potion) data).toDamageValue() & 0x3F;
break; break;
case INSTANT_POTION_BREAK:
datavalue = ((Color) data).asRGB();
break;
case RECORD_PLAY: case RECORD_PLAY:
Validate.isTrue(data == Material.AIR || ((Material) data).isRecord(), "Invalid record type!"); Validate.isTrue(data == Material.AIR || ((Material) data).isRecord(), "Invalid record type!");
datavalue = Item.getId(CraftMagicNumbers.getItem((Material) data)); datavalue = Item.getId(CraftMagicNumbers.getItem((Material) data));