|
6 | 6 | import com.laytonsmith.abstraction.MCParticleData; |
7 | 7 | import com.laytonsmith.abstraction.blocks.MCBlockData; |
8 | 8 | import com.laytonsmith.abstraction.bukkit.BukkitMCColor; |
| 9 | +import com.laytonsmith.abstraction.bukkit.BukkitMCVibration; |
9 | 10 | import com.laytonsmith.abstraction.enums.MCParticle; |
10 | 11 | import com.laytonsmith.abstraction.enums.MCVersion; |
11 | 12 | import com.laytonsmith.core.MSLog; |
|
16 | 17 | import org.bukkit.Location; |
17 | 18 | import org.bukkit.Material; |
18 | 19 | import org.bukkit.Particle; |
19 | | -import org.bukkit.Vibration; |
20 | | -import org.bukkit.entity.Entity; |
21 | 20 | import org.bukkit.inventory.ItemStack; |
22 | 21 |
|
23 | 22 | import java.lang.reflect.Constructor; |
@@ -120,18 +119,15 @@ public Object getParticleData(MCLocation l, Object data) { |
120 | 119 | return new Particle.DustTransition(Color.TEAL, Color.RED, 1.0F); |
121 | 120 | } |
122 | 121 | case VIBRATION: |
| 122 | + BukkitMCVibration vibe; |
123 | 123 | if(data instanceof MCParticleData.VibrationBlockDestination destination) { |
124 | | - return new Vibration((Location) l.getHandle(), |
125 | | - new Vibration.Destination.BlockDestination((Location) destination.location().getHandle()), |
126 | | - destination.arrivalTime()); |
| 124 | + vibe = new BukkitMCVibration(l, destination.location(), destination.arrivalTime()); |
127 | 125 | } else if(data instanceof MCParticleData.VibrationEntityDestination destination) { |
128 | | - return new Vibration((Location) l.getHandle(), |
129 | | - new Vibration.Destination.EntityDestination((Entity) destination.entity().getHandle()), |
130 | | - destination.arrivalTime()); |
| 126 | + vibe = new BukkitMCVibration(l, destination.entity(), destination.arrivalTime()); |
131 | 127 | } else { |
132 | | - return new Vibration((Location) l.getHandle(), |
133 | | - new Vibration.Destination.BlockDestination((Location) l.getHandle()), 5); |
| 128 | + vibe = new BukkitMCVibration(l, l, 5); |
134 | 129 | } |
| 130 | + return vibe.getHandle(); |
135 | 131 | case SCULK_CHARGE: |
136 | 132 | if(data instanceof Float) { |
137 | 133 | return data; |
|
0 commit comments