Merge branch '8.0.x-1.16.1'
This commit is contained in:
@@ -176,7 +176,6 @@ public class Grid implements IGrid {
|
|||||||
}
|
}
|
||||||
|
|
||||||
gridNode.getGridProxy().gridChanged();
|
gridNode.getGridProxy().gridChanged();
|
||||||
// postEventTo( gridNode, networkChanged );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-1
@@ -502,7 +502,7 @@ public class EnergyGridCache implements IEnergyGrid {
|
|||||||
private void removeRequester(IAEPowerStorage requester) {
|
private void removeRequester(IAEPowerStorage requester) {
|
||||||
Preconditions.checkState(!ongoingInjectOperation,
|
Preconditions.checkState(!ongoingInjectOperation,
|
||||||
"Cannot modify energy requesters while energy is being injected.");
|
"Cannot modify energy requesters while energy is being injected.");
|
||||||
this.requesters.add(requester);
|
this.requesters.remove(requester);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addProvider(IAEPowerStorage provider) {
|
private void addProvider(IAEPowerStorage provider) {
|
||||||
|
|||||||
Reference in New Issue
Block a user