Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/main/java/space/yurisi/universecorev2/UniverseCoreV2.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@
import space.yurisi.universecorev2.event.EventManager;
import space.yurisi.universecorev2.file.Config;
import space.yurisi.universecorev2.item.UniverseItem;
import space.yurisi.universecorev2.subplugins.universeguns.UniverseGuns;
import space.yurisi.universecorev2.logs.filter.PasswordFilter;
import space.yurisi.universecorev2.subplugins.SubPlugin;
import space.yurisi.universecorev2.subplugins.SubPluginInitializer;
import space.yurisi.universecorev2.subplugins.levelsystem.LevelSystem;
import space.yurisi.universecorev2.subplugins.playerinfoscoreboard.PlayerInfoScoreBoard;
import space.yurisi.universecorev2.world.WorldInitializer;

public final class UniverseCoreV2 extends JavaPlugin {

Expand Down Expand Up @@ -44,7 +39,6 @@ public void onEnable() {
new UniverseCoreV2API(this.connector);
new EventManager(this);
new CommandManager(this);
new WorldInitializer();
new UniverseItem();
this.sub_plugin = new SubPluginInitializer(this);
this.sub_plugin.onEnable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ private void init(){
main.getCommand("menu").setExecutor(new menuCommand());
main.getCommand("password").setExecutor(new passwordCommand());
main.getCommand("pplayer").setExecutor(new pplayerCommand());
main.getCommand("lobby").setExecutor(new lobbyCommand());
main.getCommand("giveu").setExecutor(new giveuCommand());
main.getCommand("flat").setExecutor(new flatCommand());
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import org.bukkit.Bukkit;
import space.yurisi.universecorev2.UniverseCoreV2;
import space.yurisi.universecorev2.event.block.BExplodeEvent;
import space.yurisi.universecorev2.event.block.BreakEvent;
import space.yurisi.universecorev2.event.block.PlaceEvent;
import space.yurisi.universecorev2.event.entity.ChangeBlockEvent;
import space.yurisi.universecorev2.event.entity.EExplodeEvent;
import space.yurisi.universecorev2.event.entity.EntityHangingBreakEvent;
Expand All @@ -17,8 +15,6 @@ public EventManager(UniverseCoreV2 main){

private void init(UniverseCoreV2 main) {
Bukkit.getPluginManager().registerEvents(new LoginEvent(), main);
Bukkit.getPluginManager().registerEvents(new BreakEvent(), main);
Bukkit.getPluginManager().registerEvents(new PlaceEvent(), main);
Bukkit.getPluginManager().registerEvents(new OpenMainMenuEvent(), main);
Bukkit.getPluginManager().registerEvents(new BExplodeEvent(),main);
Bukkit.getPluginManager().registerEvents(new EExplodeEvent(),main);
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package space.yurisi.universecorev2.event.player;

import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand All @@ -22,28 +23,13 @@ public void onInteract(PlayerInteractEvent event) {
return;
}

switch (targetBlock.getType()) {
case ENCHANTING_TABLE -> {
if (LuckPermsWrapper.isUserInAdminOrDevGroup(player)) {
event.setCancelled(false);
break;
}

event.setCancelled(true);
}
case ANVIL -> {
if (!player.getWorld().getName().equals("lobby")) {
return;
}

if (LuckPermsWrapper.isUserInAdminOrDevGroup(player)) {
event.setCancelled(false);
break;
}

event.setCancelled(true);
}
if (targetBlock.getType() != Material.ENCHANTING_TABLE) return;
if (LuckPermsWrapper.isUserInAdminOrDevGroup(player)) {
event.setCancelled(false);
return;
}

event.setCancelled(true);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,6 @@ public void onJoin(PlayerJoinEvent event) {
return;
}
event.joinMessage(getUserCustomJoinMessage(player));


if(player.getWorld().getName().equals("lobby")){
new BukkitRunnable() {
@Override
public void run() {
player.setAllowFlight(true);
}
}.runTaskLater(plugin, 10);
}
}

private Component getFirstJoinMessage(Player player) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

public class LobbyFishList extends BaseFishList {

// TODO: ロビー限定の魚をどこかのワールドへフォールバックするか削除する
public LobbyFishList(){
setWorldName("ロビー");
}
Expand Down
18 changes: 0 additions & 18 deletions src/main/java/space/yurisi/universecorev2/world/LobbyWorld.java

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 1 addition & 3 deletions src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ commands:
description: あなたの役職を確認します
giveu:
description: オンラインのプレイヤーに経験値を与えます
lobby:
description: ロビーに戻ります
flat:
description: フラットワールドに行きます。

Expand Down Expand Up @@ -171,4 +169,4 @@ commands:

#fly
fly:
description: 飛行モードを切り替えます
description: 飛行モードを切り替えます
2 changes: 1 addition & 1 deletion src/main/resources/subplugins/mywarp.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
settings:
deny-worlds:
- lobby
- lobby
3 changes: 1 addition & 2 deletions src/main/resources/subplugins/tickfreezer.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
settings:
deny-worlds:
- lobby
- pvp
- pvp