Merge pull request #5 from repo-alt/AE2-RV3

Wireless terminal fix
This commit is contained in:
repo-alt authored and GitHub committed 2020-09-15 20:50:34 +03:00
commit 3223572b4c
9 files changed
+11 -21

No files matched your search

+2 -2
View File
@@ -28,7 +28,7 @@ apply plugin: 'java'
sourceCompatibility = 1.8
targetCompatibility = 1.8
version = "1.1.3.4"
version = "1.1.3.5"
group= "thaumicenergistics" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "thaumicenergistics"
@@ -60,7 +60,7 @@ dependencies {
compile "mcp.mobius.waila:Waila:1.5.10_1.7.10"
compile "net.industrial-craft:industrialcraft-2:2.2.828-experimental:api"
compile "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"
compileOnly "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
}
processResources
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -267,26 +267,16 @@ public abstract class WirelessAELink
ArrayList<IWirelessAccessPoint> apList = null;
if( this.accessPoint != null )
{
try
{
IGrid grid = this.accessPoint.getGrid();
// Get a list of AP's in range
if( grid != null )
{
apList = WirelessAELink.locateAPsInRange( w, x, y, z, grid );
}
else
{
apList = WirelessAELink.locateAPsInRange( w, x, y, z, this.encryptionKey );
}
}
catch( GridException e )
{
// :(
try {
IGrid grid = accessPoint != null ? accessPoint.getGrid() : null;
// Get a list of AP's in range
if (grid != null) {
apList = WirelessAELink.locateAPsInRange(w, x, y, z, grid);
} else {
apList = WirelessAELink.locateAPsInRange(w, x, y, z, this.encryptionKey);
}
} catch (GridException ignored) {
// :(
}
// Determine the closest AP