coral/SSSBliss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	src/main/java/io/github/thetrouper/sssbliss/SSSBliss.java
#	src/main/java/io/github/thetrouper/sssbliss/cmds/SSSBlissCommand.java
#	src/main/java/io/github/thetrouper/sssbliss/events/GemMoveListener.java
#	src/main/java/io/github/thetrouper/sssbliss/events/GemUseListener.java
#	src/main/java/io/github/thetrouper/sssbliss/events/JoinListener.java
#	src/main/java/io/github/thetrouper/sssbliss/events/TrollListener.java
#	src/main/java/io/github/thetrouper/sssbliss/server/fun/utility/heal/InstantHeal.java
#	src/main/java/io/github/thetrouper/sssbliss/server/fun/utility/kill/Lazer.java
#	src/main/java/io/github/thetrouper/sssbliss/server/fun/utility/kill/OrbitalStrike.java
#	src/main/java/io/github/thetrouper/sssbliss/server/fun/utility/stun/Drain.java
#	src/main/java/io/github/thetrouper/sssbliss/server/fun/utility/stun/Launch.java
#	src/main/java/io/github/thetrouper/sssbliss/server/fun/utility/stun/Stun.java
This commit is contained in:
TheTelly1
2024-04-26 07:54:55 -05:00
parent fdf1662420 28360b0a25
commit aca5c75cbe
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/github/thetrouper/sssbliss/server/util/ServerUtils.java
View File

@@ -5,7 +5,11 @@ import io.github.thetrouper.sssbliss.cmds.SSSBlissCommand;
import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.metadata.MetadataValue; import org.bukkit.metadata.MetadataValue;