MiniDay/hamster-little-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(hamster-ball-bridge): 修复 bc 的事件转发bug

Browse Source
This commit is contained in:
叁只仓鼠
2023-11-12 18:02:28 +08:00
parent 709ae30810
commit 238d1935bc
5 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hamster-ball-bridge/build.gradle
View File

@@ -1,4 +1,4 @@
version = '1.4.0' version = '1.4.1'
setArchivesBaseName("HamsterBall-Bridge") setArchivesBaseName("HamsterBall-Bridge")
dependencies { dependencies {

2
hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java
View File

@@ -4,7 +4,7 @@ import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
import cn.hamster3.service.bukkit.command.ServiceCommand; import cn.hamster3.service.bukkit.command.ServiceCommand;
import cn.hamster3.service.bukkit.hook.ServicePlaceholderHook; import cn.hamster3.service.bukkit.hook.ServicePlaceholderHook;
import cn.hamster3.service.bukkit.listener.ServiceMainListener; import cn.hamster3.service.bukkit.listener.ServiceMainListener;
import cn.hamster3.service.common.listener.BridgeListener; import cn.hamster3.service.bukkit.listener.BridgeListener;
import cn.hamster3.service.common.util.ServiceLogUtils; import cn.hamster3.service.common.util.ServiceLogUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

2
hamster-ball-bridge/src/main/java/cn/hamster3/service/common/listener/BridgeListener.java → hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java
View File

@@ -1,4 +1,4 @@
package cn.hamster3.service.common.listener; package cn.hamster3.service.bukkit.listener;
import cn.hamster3.mc.plugin.ball.common.data.BallMessage; import cn.hamster3.mc.plugin.ball.common.data.BallMessage;
import cn.hamster3.service.bukkit.api.ServiceInfoAPI; import cn.hamster3.service.bukkit.api.ServiceInfoAPI;

2
hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java
View File

@@ -2,8 +2,8 @@ package cn.hamster3.service.bungee;
import cn.hamster3.mc.plugin.ball.common.api.BallAPI; import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
import cn.hamster3.service.bungee.command.ServiceCommand; import cn.hamster3.service.bungee.command.ServiceCommand;
import cn.hamster3.service.bungee.listener.BridgeListener;
import cn.hamster3.service.bungee.listener.ServiceMainListener; import cn.hamster3.service.bungee.listener.ServiceMainListener;
import cn.hamster3.service.common.listener.BridgeListener;
import cn.hamster3.service.common.util.ServiceLogUtils; import cn.hamster3.service.common.util.ServiceLogUtils;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;

40
hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/BridgeListener.java Normal file
View File

@@ -0,0 +1,40 @@
package cn.hamster3.service.bungee.listener;
import cn.hamster3.mc.plugin.ball.common.data.BallMessage;
import cn.hamster3.service.bungee.api.ServiceInfoAPI;
import cn.hamster3.service.bungee.event.MessageReceivedEvent;
import cn.hamster3.service.bungee.event.MessageSentEvent;
import cn.hamster3.service.common.entity.ServiceMessageInfo;
import com.google.common.eventbus.Subscribe;
import net.md_5.bungee.api.ProxyServer;
public class BridgeListener {
public static final BridgeListener INSTANCE = new BridgeListener();
private BridgeListener() {
}
@Subscribe
public void onMessageSent(cn.hamster3.mc.plugin.ball.common.event.message.MessageSentEvent event) {
BallMessage ballMessage = event.getMessage();
ProxyServer.getInstance().getPluginManager().callEvent(new MessageSentEvent(new ServiceMessageInfo(
ServiceInfoAPI.getSenderInfo(ballMessage.getSenderID()),
ballMessage.getReceiverID(),
event.getChannel(),
ballMessage.getAction(),
ballMessage.getContent()
)));
}
@Subscribe
public void onMessageReceived(cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent event) {
BallMessage ballMessage = event.getMessage();
ProxyServer.getInstance().getPluginManager().callEvent(new MessageReceivedEvent(new ServiceMessageInfo(
ServiceInfoAPI.getSenderInfo(ballMessage.getSenderID()),
ballMessage.getReceiverID(),
event.getChannel(),
ballMessage.getAction(),
ballMessage.getContent()
)));
}
}