Skip to content

Commit 5cb9eb9

Browse files
committed
Make sure that a WirelessPoint is added or removed from the config
1 parent 4b9735c commit 5cb9eb9

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

core/src/main/java/net/licks92/wirelessredstone/signs/WirelessChannel.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,17 @@ public void turnOff(Location loc, boolean force) {
157157

158158
public void addWirelessPoint(WirelessPoint wirelessPoint) {
159159
if (wirelessPoint instanceof WirelessTransmitter) {
160-
transmitters.add((WirelessTransmitter) wirelessPoint);
160+
if (!transmitters.contains(wirelessPoint)) {
161+
transmitters.add((WirelessTransmitter) wirelessPoint);
162+
}
161163
} else if (wirelessPoint instanceof WirelessScreen) {
162-
screens.add((WirelessScreen) wirelessPoint);
164+
if (!screens.contains(wirelessPoint)) {
165+
screens.add((WirelessScreen) wirelessPoint);
166+
}
163167
} else if (wirelessPoint instanceof WirelessReceiver) {
164-
receivers.add((WirelessReceiver) wirelessPoint);
168+
if (!receivers.contains(wirelessPoint)) {
169+
receivers.add((WirelessReceiver) wirelessPoint);
170+
}
165171
}
166172

167173
//TODO: Maybe add owner from wirelesspoint to list of owners

core/src/main/java/net/licks92/wirelessredstone/storage/StorageConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package net.licks92.wirelessredstone.storage;
22

3+
import net.licks92.wirelessredstone.WirelessRedstone;
34
import net.licks92.wirelessredstone.signs.WirelessChannel;
45
import net.licks92.wirelessredstone.signs.WirelessPoint;
5-
import net.licks92.wirelessredstone.WirelessRedstone;
66
import org.bukkit.Bukkit;
77
import org.bukkit.Location;
88
import org.bukkit.Material;
@@ -40,15 +40,15 @@ public boolean createChannel(WirelessChannel channel) {
4040
public boolean createWirelessPoint(String channelName, WirelessPoint wirelessPoint) {
4141
WirelessChannel channel = WirelessRedstone.getStorageManager().getChannel(channelName);
4242
//TODO: Investigate if this duplicates the wirelesspoint into the channel
43-
// channel.addWirelessPoint(wirelessPoint);
43+
channel.addWirelessPoint(wirelessPoint);
4444
WirelessRedstone.getStorageManager().updateList(channelName, channel);
4545
return true;
4646
}
4747

4848
public boolean removeWirelessPoint(String channelName, WirelessPoint wirelessPoint) {
4949
WirelessChannel channel = WirelessRedstone.getStorageManager().getChannel(channelName);
5050
//TODO: Investigate if this duplicates the wirelesspoint into the channel
51-
// channel.removeWirelessPoint(wirelessPoint);
51+
channel.removeWirelessPoint(wirelessPoint);
5252

5353
if (channel.isEmpty()) {
5454
WirelessRedstone.getStorage().removeChannel(channelName, false);

0 commit comments

Comments
 (0)