Skip to content

Commit

Permalink
Fix post-merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
vyPal committed Jan 10, 2025
1 parent 788ea0c commit 2bc3f1e
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pumpkin/src/command/commands/cmd_plugin.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use async_trait::async_trait;
use pumpkin_core::{
use pumpkin_util::{
text::{color::NamedColor, hover::HoverEvent, TextComponent},
PermissionLvl,
};
Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/command/commands/cmd_plugins.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use async_trait::async_trait;
use pumpkin_core::text::{color::NamedColor, hover::HoverEvent, TextComponent};
use pumpkin_util::text::{color::NamedColor, hover::HoverEvent, TextComponent};

use crate::{
command::{
Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::sync::LazyLock;

use plugin::PluginManager;
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;
use tokio::sync::Mutex;

pub mod block;
Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/plugin/api/context.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{fs, path::Path, sync::Arc};

use pumpkin_core::PermissionLvl;
use pumpkin_util::PermissionLvl;
use tokio::sync::RwLock;

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/plugin/api/events/player/join.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::sync::Arc;

use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use crate::{
entity::player::Player,
Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/plugin/api/events/player/leave.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::sync::Arc;

use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use crate::{
entity::player::Player,
Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/plugin/api/events/player/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pumpkin_core::text::TextComponent;
use pumpkin_util::text::TextComponent;

use crate::entity::player::Player;

Expand Down

0 comments on commit 2bc3f1e

Please sign in to comment.