Skip to content

Commit 6bcc70c

Browse files
committed
修复网络事件报错
1 parent 1c1c4d7 commit 6bcc70c

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/main/java/com/balugaq/netex/api/events/NetworkRootLocateStorageEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public class NetworkRootLocateStorageEvent extends Event {
1515
private final StorageType storageType;
1616
private final boolean inputAble;
1717
private final boolean outputAble;
18-
public NetworkRootLocateStorageEvent(NetworkRoot root, StorageType storageType, boolean inputAble, boolean outputAble) {
19-
super();
18+
public NetworkRootLocateStorageEvent(NetworkRoot root, StorageType storageType, boolean inputAble, boolean outputAble, boolean isSync) {
19+
super(!isSync);
2020
this.root = root;
2121
this.storageType = storageType;
2222
this.inputAble = inputAble;

src/main/java/com/balugaq/netex/api/events/NetworkRootReadyEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class NetworkRootReadyEvent extends Event {
1111
private static final HandlerList handlers = new HandlerList();
1212
private final NetworkRoot root;
1313
public NetworkRootReadyEvent(NetworkRoot root) {
14-
super();
14+
super(true);
1515
this.root = root;
1616
}
1717
@NotNull

src/main/java/io/github/sefiraat/networks/network/NetworkRoot.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ public Set<BarrelIdentity> getBarrels() {
592592
}
593593

594594
this.barrels = barrelSet;
595-
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.BARREL, true, true);
595+
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.BARREL, true, true, Bukkit.isPrimaryThread());
596596
Bukkit.getPluginManager().callEvent(event);
597597
return barrelSet;
598598
}
@@ -633,7 +633,7 @@ public Map<StorageUnitData, Location> getCargoStorageUnitDatas() {
633633
}
634634

635635
this.cargoStorageUnitDatas = dataSet;
636-
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.DRAWER, true, true);
636+
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.DRAWER, true, true, Bukkit.isPrimaryThread());
637637
Bukkit.getPluginManager().callEvent(event);
638638
return dataSet;
639639
}
@@ -1418,7 +1418,7 @@ public Set<BarrelIdentity> getInputAbleBarrels() {
14181418
}
14191419

14201420
this.inputAbleBarrels = barrelSet;
1421-
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.BARREL, true, false);
1421+
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.BARREL, true, false, Bukkit.isPrimaryThread());
14221422
Bukkit.getPluginManager().callEvent(event);
14231423
return barrelSet;
14241424
}
@@ -1488,7 +1488,7 @@ public Set<BarrelIdentity> getOutputAbleBarrels() {
14881488
}
14891489

14901490
this.outputAbleBarrels = barrelSet;
1491-
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.BARREL, false, true);
1491+
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.BARREL, false, true, Bukkit.isPrimaryThread());
14921492
Bukkit.getPluginManager().callEvent(event);
14931493
return barrelSet;
14941494
}
@@ -1531,7 +1531,7 @@ public Map<StorageUnitData, Location> getInputAbleCargoStorageUnitDatas() {
15311531
}
15321532

15331533
this.inputAbleCargoStorageUnitDatas = dataSet;
1534-
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.DRAWER, true, false);
1534+
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.DRAWER, true, false, Bukkit.isPrimaryThread());
15351535
Bukkit.getPluginManager().callEvent(event);
15361536
return dataSet;
15371537
}
@@ -1574,7 +1574,7 @@ public Map<StorageUnitData, Location> getOutputAbleCargoStorageUnitDatas() {
15741574
}
15751575

15761576
this.outputAbleCargoStorageUnitDatas = dataSet;
1577-
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.DRAWER, false, true);
1577+
NetworkRootLocateStorageEvent event = new NetworkRootLocateStorageEvent(this, StorageType.DRAWER, false, true, Bukkit.isPrimaryThread());
15781578
Bukkit.getPluginManager().callEvent(event);
15791579
return dataSet;
15801580
}

0 commit comments

Comments
 (0)