Skip to content

Commit 86c05b3

Browse files
Pieter12345Pieter12345
committed
Moved server events to their own class.
Moved BukkitMCServerCommandEvent and BukkitMCServerPingEvent from BukkitMiscEvents to BukkitServerEvents.
1 parent 314146e commit 86c05b3

4 files changed

Lines changed: 132 additions & 121 deletions

File tree

‎src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitMiscEvents.java‎

Lines changed: 0 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,13 @@
66
import com.laytonsmith.abstraction.bukkit.BukkitMCCommand;
77
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCPlayer;
88
import com.laytonsmith.abstraction.events.MCCommandTabCompleteEvent;
9-
import com.laytonsmith.abstraction.events.MCServerCommandEvent;
109
import com.laytonsmith.abstraction.events.MCPluginIncomingMessageEvent;
11-
import com.laytonsmith.abstraction.events.MCServerPingEvent;
1210
import org.bukkit.command.Command;
1311
import org.bukkit.entity.Player;
14-
import org.bukkit.event.server.ServerCommandEvent;
15-
import org.bukkit.event.server.ServerListPingEvent;
16-
17-
import java.net.InetAddress;
18-
import java.util.Collection;
19-
import java.util.HashSet;
20-
import java.util.Iterator;
2112
import java.util.List;
22-
import java.util.Set;
2313

2414
public class BukkitMiscEvents {
2515

26-
public static class BukkitMCServerCommandEvent implements MCServerCommandEvent {
27-
28-
ServerCommandEvent sce;
29-
MCCommandSender sender;
30-
31-
public BukkitMCServerCommandEvent(ServerCommandEvent sce, MCCommandSender sender) {
32-
this.sce = sce;
33-
this.sender = sender;
34-
}
35-
36-
@Override
37-
public Object _GetObject() {
38-
return sce;
39-
}
40-
41-
@Override
42-
public String getCommand() {
43-
return sce.getCommand();
44-
}
45-
46-
@Override
47-
public void setCommand(String command) {
48-
sce.setCommand(command);
49-
}
50-
51-
@Override
52-
public MCCommandSender getCommandSender() {
53-
return sender;
54-
}
55-
}
56-
5716
/*
5817
* Not an actual event, but making it one.
5918
*/
@@ -90,82 +49,6 @@ public Object _GetObject() {
9049
}
9150
}
9251

93-
public static class BukkitMCServerPingEvent implements MCServerPingEvent {
94-
95-
private final ServerListPingEvent slp;
96-
97-
public BukkitMCServerPingEvent(ServerListPingEvent event) {
98-
slp = event;
99-
}
100-
101-
@Override
102-
public Object _GetObject() {
103-
return slp;
104-
}
105-
106-
@Override
107-
public InetAddress getAddress() {
108-
return slp.getAddress();
109-
}
110-
111-
@Override
112-
public int getMaxPlayers() {
113-
return slp.getMaxPlayers();
114-
}
115-
116-
@Override
117-
public String getMOTD() {
118-
return slp.getMotd();
119-
}
120-
121-
@Override
122-
public int getNumPlayers() {
123-
return slp.getNumPlayers();
124-
}
125-
126-
@Override
127-
public void setMaxPlayers(int max) {
128-
slp.setMaxPlayers(max);
129-
}
130-
131-
@Override
132-
public void setMOTD(String motd) {
133-
slp.setMotd(motd);
134-
}
135-
136-
@Override
137-
public Set<MCPlayer> getPlayers() {
138-
Set<MCPlayer> players = new HashSet<>();
139-
try {
140-
Iterator<Player> iterator = slp.iterator();
141-
while(iterator.hasNext()) {
142-
players.add(new BukkitMCPlayer(iterator.next()));
143-
}
144-
} catch(UnsupportedOperationException ex) {
145-
// not implemented, ignore
146-
}
147-
return players;
148-
}
149-
150-
@Override
151-
public void setPlayers(Collection<MCPlayer> players) {
152-
Set<Player> ps = new HashSet<>();
153-
for(MCPlayer player : players) {
154-
ps.add((Player) player.getHandle());
155-
}
156-
try {
157-
Iterator<Player> iterator = slp.iterator();
158-
while(iterator.hasNext()) {
159-
if(!ps.contains(iterator.next())) {
160-
iterator.remove();
161-
}
162-
}
163-
} catch(UnsupportedOperationException ex) {
164-
// not implemented, ignore
165-
}
166-
}
167-
}
168-
16952
public static class BukkitMCCommandTabCompleteEvent implements MCCommandTabCompleteEvent {
17053

17154
List<String> comp;

‎src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitServerEvents.java‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
package com.laytonsmith.abstraction.bukkit.events;
2+
3+
import com.laytonsmith.abstraction.MCCommandSender;
4+
import com.laytonsmith.abstraction.MCPlayer;
5+
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCPlayer;
6+
import com.laytonsmith.abstraction.events.MCServerCommandEvent;
7+
import com.laytonsmith.abstraction.events.MCServerPingEvent;
8+
import org.bukkit.entity.Player;
9+
import org.bukkit.event.server.ServerCommandEvent;
10+
import org.bukkit.event.server.ServerListPingEvent;
11+
12+
import java.net.InetAddress;
13+
import java.util.Collection;
14+
import java.util.HashSet;
15+
import java.util.Iterator;
16+
import java.util.Set;
17+
18+
public class BukkitServerEvents {
19+
20+
public static class BukkitMCServerCommandEvent implements MCServerCommandEvent {
21+
22+
ServerCommandEvent sce;
23+
MCCommandSender sender;
24+
25+
public BukkitMCServerCommandEvent(ServerCommandEvent sce, MCCommandSender sender) {
26+
this.sce = sce;
27+
this.sender = sender;
28+
}
29+
30+
@Override
31+
public Object _GetObject() {
32+
return sce;
33+
}
34+
35+
@Override
36+
public String getCommand() {
37+
return sce.getCommand();
38+
}
39+
40+
@Override
41+
public void setCommand(String command) {
42+
sce.setCommand(command);
43+
}
44+
45+
@Override
46+
public MCCommandSender getCommandSender() {
47+
return sender;
48+
}
49+
}
50+
51+
public static class BukkitMCServerPingEvent implements MCServerPingEvent {
52+
53+
private final ServerListPingEvent slp;
54+
55+
public BukkitMCServerPingEvent(ServerListPingEvent event) {
56+
slp = event;
57+
}
58+
59+
@Override
60+
public Object _GetObject() {
61+
return slp;
62+
}
63+
64+
@Override
65+
public InetAddress getAddress() {
66+
return slp.getAddress();
67+
}
68+
69+
@Override
70+
public int getMaxPlayers() {
71+
return slp.getMaxPlayers();
72+
}
73+
74+
@Override
75+
public String getMOTD() {
76+
return slp.getMotd();
77+
}
78+
79+
@Override
80+
public int getNumPlayers() {
81+
return slp.getNumPlayers();
82+
}
83+
84+
@Override
85+
public void setMaxPlayers(int max) {
86+
slp.setMaxPlayers(max);
87+
}
88+
89+
@Override
90+
public void setMOTD(String motd) {
91+
slp.setMotd(motd);
92+
}
93+
94+
@Override
95+
public Set<MCPlayer> getPlayers() {
96+
Set<MCPlayer> players = new HashSet<>();
97+
try {
98+
Iterator<Player> iterator = slp.iterator();
99+
while(iterator.hasNext()) {
100+
players.add(new BukkitMCPlayer(iterator.next()));
101+
}
102+
} catch(UnsupportedOperationException ex) {
103+
// not implemented, ignore
104+
}
105+
return players;
106+
}
107+
108+
@Override
109+
public void setPlayers(Collection<MCPlayer> players) {
110+
Set<Player> ps = new HashSet<>();
111+
for(MCPlayer player : players) {
112+
ps.add((Player) player.getHandle());
113+
}
114+
try {
115+
Iterator<Player> iterator = slp.iterator();
116+
while(iterator.hasNext()) {
117+
if(!ps.contains(iterator.next())) {
118+
iterator.remove();
119+
}
120+
}
121+
} catch(UnsupportedOperationException ex) {
122+
// not implemented, ignore
123+
}
124+
}
125+
}
126+
127+
128+
}

‎src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitServerListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.laytonsmith.abstraction.MCLocation;
44
import com.laytonsmith.abstraction.bukkit.BukkitMCLocation;
5-
import com.laytonsmith.abstraction.bukkit.events.BukkitMiscEvents;
5+
import com.laytonsmith.abstraction.bukkit.events.BukkitServerEvents;
66
import com.laytonsmith.abstraction.events.MCRedstoneChangedEvent;
77
import com.laytonsmith.core.events.Driver;
88
import com.laytonsmith.core.events.EventUtils;
@@ -18,7 +18,7 @@ public class BukkitServerListener implements Listener {
1818

1919
@EventHandler(priority = EventPriority.LOWEST)
2020
public void onPing(ServerListPingEvent event) {
21-
BukkitMiscEvents.BukkitMCServerPingEvent pe = new BukkitMiscEvents.BukkitMCServerPingEvent(event);
21+
BukkitServerEvents.BukkitMCServerPingEvent pe = new BukkitServerEvents.BukkitMCServerPingEvent(event);
2222
EventUtils.TriggerListener(Driver.SERVER_PING, "server_ping", pe);
2323
}
2424

‎src/main/java/com/laytonsmith/commandhelper/CommandHelperServerListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.laytonsmith.abstraction.bukkit.BukkitMCCommandSender;
66
import com.laytonsmith.abstraction.bukkit.BukkitMCConsoleCommandSender;
77
import com.laytonsmith.abstraction.bukkit.entities.BukkitMCCommandMinecart;
8-
import com.laytonsmith.abstraction.bukkit.events.BukkitMiscEvents;
8+
import com.laytonsmith.abstraction.bukkit.events.BukkitServerEvents;
99
import com.laytonsmith.abstraction.enums.MCChatColor;
1010
import com.laytonsmith.core.InternalException;
1111
import com.laytonsmith.core.Static;
@@ -37,7 +37,7 @@ public void onServerCommand(ServerCommandEvent event) {
3737
sender = new BukkitMCCommandSender(event.getSender());
3838
}
3939

40-
BukkitMiscEvents.BukkitMCServerCommandEvent cce = new BukkitMiscEvents.BukkitMCServerCommandEvent(event, sender);
40+
BukkitServerEvents.BukkitMCServerCommandEvent cce = new BukkitServerEvents.BukkitMCServerCommandEvent(event, sender);
4141
EventUtils.TriggerListener(Driver.SERVER_COMMAND, "server_command", cce);
4242
try {
4343
if(event.isCancelled()) {

0 commit comments

Comments
 (0)