Skip to content

Commit 215cfa4

Browse files
committed
代码格式调整:统一代码风格,修复部分事件监听器方法格式问题。
1 parent bb68ad6 commit 215cfa4

File tree

1 file changed

+29
-31
lines changed

1 file changed

+29
-31
lines changed

src/main/java/cc/baka9/catseedlogin/bukkit/Listeners.java

+29-31
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222

2323
public class Listeners implements Listener {
2424

25-
private boolean playerIsNotMinecraftPlayer(Player p) {
25+
private boolean playerIsNotMinecraftPlayer(Player p){
2626
return !p.getClass().getName().matches("org\\.bukkit\\.craftbukkit.*?\\.entity\\.CraftPlayer");
2727
}
2828

2929
@EventHandler
30-
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
30+
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event){
3131
if (playerIsNotMinecraftPlayer(event.getPlayer())) return;
3232
if (LoginPlayerHelper.isLogin(event.getPlayer().getName())) return;
3333
String input = event.getMessage().toLowerCase();
@@ -39,7 +39,7 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
3939
}
4040

4141
@EventHandler
42-
public void onPlayerLogin(AsyncPlayerPreLoginEvent event) {
42+
public void onPlayerLogin(AsyncPlayerPreLoginEvent event){
4343
if (!Cache.isLoaded) {
4444
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "服务器还在初始化..");
4545
return;
@@ -71,35 +71,35 @@ public void onPlayerLogin(AsyncPlayerPreLoginEvent event) {
7171
}
7272

7373
@EventHandler
74-
public void onPlayerChat(AsyncPlayerChatEvent event) {
74+
public void onPlayerChat(AsyncPlayerChatEvent event){
7575
if (playerIsNotMinecraftPlayer(event.getPlayer())) return;
7676
if (LoginPlayerHelper.isLogin(event.getPlayer().getName())) return;
7777
event.setCancelled(true);
7878
}
7979

8080
@EventHandler
81-
public void onPlayerInteract(PlayerInteractEvent event) {
81+
public void onPlayerInteract(PlayerInteractEvent event){
8282
if (playerIsNotMinecraftPlayer(event.getPlayer())) return;
8383
if (LoginPlayerHelper.isLogin(event.getPlayer().getName())) return;
8484
event.setCancelled(true);
8585
}
8686

8787
@EventHandler
88-
public void onInventoryOpen(InventoryOpenEvent event) {
88+
public void onInventoryOpen(InventoryOpenEvent event){
8989
if (LoginPlayerHelper.isLogin(event.getPlayer().getName())) return;
9090
event.setCancelled(true);
9191
}
9292

9393
@EventHandler
94-
public void onInventoryClick(InventoryClickEvent event) {
94+
public void onInventoryClick(InventoryClickEvent event){
9595
if (!(event.getWhoClicked() instanceof Player) || LoginPlayerHelper.isLogin(event.getWhoClicked().getName()))
9696
return;
9797
event.setCancelled(true);
9898
}
9999

100100
//登陆之前不能攻击
101101
@EventHandler
102-
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
102+
public void onEntityDamageByEntity(EntityDamageByEntityEvent event){
103103
if (!(event.getDamager() instanceof Player)) return;
104104
if (playerIsNotMinecraftPlayer((Player) event.getDamager())) return;
105105
if (LoginPlayerHelper.isLogin(event.getDamager().getName())) return;
@@ -108,7 +108,7 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
108108

109109
//登陆之前不会受到伤害
110110
@EventHandler
111-
public void onEntityDamage(EntityDamageEvent event) {
111+
public void onEntityDamage(EntityDamageEvent event){
112112
if (Config.Settings.BeforeLoginNoDamage) {
113113

114114
Entity entity = event.getEntity();
@@ -124,22 +124,22 @@ public void onEntityDamage(EntityDamageEvent event) {
124124
}
125125

126126
@EventHandler
127-
public void onPlayerTeleport(PlayerTeleportEvent event) {
127+
public void onPlayerTeleport(PlayerTeleportEvent event){
128128
if (Config.Settings.CanTpSpawnLocation && event.getTo().equals(Config.Settings.SpawnLocation)) return;
129129
if (playerIsNotMinecraftPlayer(event.getPlayer())) return;
130130
if (LoginPlayerHelper.isLogin(event.getPlayer().getName())) return;
131131
event.setCancelled(true);
132132
}
133133

134134
@EventHandler
135-
public void onPlayerDropItem(PlayerDropItemEvent event) {
135+
public void onPlayerDropItem(PlayerDropItemEvent event){
136136
if (playerIsNotMinecraftPlayer(event.getPlayer())) return;
137137
if (LoginPlayerHelper.isLogin(event.getPlayer().getName())) return;
138138
event.setCancelled(true);
139139
}
140140

141141
@EventHandler
142-
public void onEntityPickupItem(EntityPickupItemEvent event) {
142+
public void onEntityPickupItem(EntityPickupItemEvent event){
143143
if (!(event.getEntity() instanceof Player)) return;
144144
Player player = (Player) event.getEntity();
145145
if (playerIsNotMinecraftPlayer(player)) return;
@@ -148,7 +148,7 @@ public void onEntityPickupItem(EntityPickupItemEvent event) {
148148
}
149149

150150
@EventHandler
151-
public void onPlayerMove(PlayerMoveEvent event) {
151+
public void onPlayerMove(PlayerMoveEvent event){
152152
Player player = event.getPlayer();
153153
if (playerIsNotMinecraftPlayer(player)) return;
154154
if (LoginPlayerHelper.isLogin(player.getName())) return;
@@ -167,7 +167,7 @@ public void onPlayerMove(PlayerMoveEvent event) {
167167
}
168168

169169
@EventHandler
170-
public void onPlayerQuit(PlayerQuitEvent event) {
170+
public void onPlayerQuit(PlayerQuitEvent event){
171171
Player player = event.getPlayer();
172172
if (LoginPlayerHelper.isLogin(player.getName())) {
173173
if (!player.isDead() || Config.Settings.DeathStateQuitRecordLocation) {
@@ -180,7 +180,7 @@ public void onPlayerQuit(PlayerQuitEvent event) {
180180
}
181181

182182
@EventHandler
183-
public void onPlayerJoin(PlayerJoinEvent event) {
183+
public void onPlayerJoin(PlayerJoinEvent event){
184184
Player p = event.getPlayer();
185185
if (Config.Settings.BedrockLoginBypass && LoginPlayerHelper.isFloodgatePlayer(p)) {
186186
p.sendMessage(Config.Language.BEDROCK_LOGIN_BYPASS);
@@ -194,7 +194,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
194194

195195
//id只能下划线字母数字
196196
@EventHandler
197-
public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event) {
197+
public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event){
198198
String name = event.getName();
199199
if (Config.Settings.LimitChineseID) {
200200
if (!name.matches("^\\w+$")) {
@@ -203,23 +203,21 @@ public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event) {
203203
}
204204
}
205205
if (Config.Settings.FloodgatePrefixProtect && Bukkit.getPluginManager().getPlugin("floodgate") != null) {
206-
if (Config.Settings.BedrockLoginBypass && Bukkit.getPluginManager().getPlugin("floodgate") != null) {
207-
String prefix = FloodgateApi.getInstance().getPlayerPrefix();
208-
if (event.getName().startsWith(prefix) && !FloodgateApi.getInstance().isFloodgatePlayer(event.getUniqueId())) {
209-
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER,
210-
"非法的基岩版玩家名称,请非基岩版玩家的名称不要以" + prefix + "开头");
211-
}
212-
}
213-
if (name.length() < Config.Settings.MinLengthID) {
214-
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER,
215-
"你的游戏名太短了,至少需要 " + Config.Settings.MinLengthID + " 个字符的长度");
216-
}
217-
if (name.length() > Config.Settings.MaxLengthID) {
206+
String prefix = FloodgateApi.getInstance().getPlayerPrefix();
207+
if (event.getName().startsWith(prefix) && !FloodgateApi.getInstance().isFloodgatePlayer(event.getUniqueId())) {
218208
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER,
219-
"你的游戏名太长了,最长只能到达 " + Config.Settings.MaxLengthID + " 个字符的长度");
209+
"非法的基岩版玩家名称,请非基岩版玩家的名称不要以" + prefix + "开头");
220210
}
221-
211+
}
212+
if (name.length() < Config.Settings.MinLengthID) {
213+
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER,
214+
"你的游戏名太短了,至少需要 " + Config.Settings.MinLengthID + " 个字符的长度");
215+
}
216+
if (name.length() > Config.Settings.MaxLengthID) {
217+
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER,
218+
"你的游戏名太长了,最长只能到达 " + Config.Settings.MaxLengthID + " 个字符的长度");
222219
}
223220

224221
}
225-
}
222+
223+
}

0 commit comments

Comments
 (0)