Skip to content

Commit 01bdb8a

Browse files
committed
Fix 1.16.5 compatibility
Was broken since build-500
1 parent 75366d4 commit 01bdb8a

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCParticle.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.laytonsmith.abstraction.MCParticleData;
77
import com.laytonsmith.abstraction.blocks.MCBlockData;
88
import com.laytonsmith.abstraction.bukkit.BukkitMCColor;
9+
import com.laytonsmith.abstraction.bukkit.BukkitMCVibration;
910
import com.laytonsmith.abstraction.enums.MCParticle;
1011
import com.laytonsmith.abstraction.enums.MCVersion;
1112
import com.laytonsmith.core.MSLog;
@@ -16,8 +17,6 @@
1617
import org.bukkit.Location;
1718
import org.bukkit.Material;
1819
import org.bukkit.Particle;
19-
import org.bukkit.Vibration;
20-
import org.bukkit.entity.Entity;
2120
import org.bukkit.inventory.ItemStack;
2221

2322
import java.lang.reflect.Constructor;
@@ -120,18 +119,15 @@ public Object getParticleData(MCLocation l, Object data) {
120119
return new Particle.DustTransition(Color.TEAL, Color.RED, 1.0F);
121120
}
122121
case VIBRATION:
122+
BukkitMCVibration vibe;
123123
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());
127125
} 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());
131127
} else {
132-
return new Vibration((Location) l.getHandle(),
133-
new Vibration.Destination.BlockDestination((Location) l.getHandle()), 5);
128+
vibe = new BukkitMCVibration(l, l, 5);
134129
}
130+
return vibe.getHandle();
135131
case SCULK_CHARGE:
136132
if(data instanceof Float) {
137133
return data;

0 commit comments

Comments
 (0)