mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix npes

Browse Source
This commit is contained in:
Daniel Mills 2020-10-15 23:47:32 -04:00
parent 31320b4ab7
commit 6cb48e76a8
5 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/jarRepositories.xml generated
View File

@ -36,5 +36,10 @@
<option name="name" value="CodeMC" />
<option name="url" value="https://repo.codemc.org/repository/maven-public" />
</remote-repository>
<remote-repository>
<option name="id" value="nexus" />
<option name="name" value="Lumine Releases" />
<option name="url" value="https://mvn.lumine.io/repository/maven-public/" />
</remote-repository>
</component>
</project>

13
.idea/libraries/Maven__io_lumine_xikage_MythicMobs_4_9_1.xml generated Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.lumine.xikage:MythicMobs:4.9.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/lumine/xikage/MythicMobs/4.9.1/MythicMobs-4.9.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/lumine/xikage/MythicMobs/4.9.1/MythicMobs-4.9.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/lumine/xikage/MythicMobs/4.9.1/MythicMobs-4.9.1-sources.jar!/" />
</SOURCES>
</library>
</component>

1
Iris.iml
View File

@ -33,6 +33,7 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit.craftbukkit:cb-1.14.4:1.14.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bstats:bstats-bukkit:1.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.lumine.xikage:MythicMobs:4.9.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
</component>

7
src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java
View File

@ -353,9 +353,12 @@ public abstract class ParallaxTerrainProvider extends TopographicTerrainProvider
placeObject(k, i, j, random.nextParallelRNG((34 * ((i * 30) + (j * 30) + g++) * i * j) + i - j + 3566522));
}
for(IrisObjectPlacement k : r.getSurfaceObjects())
if(r != null)
{
placeObject(k, i, j, random.nextParallelRNG((34 * ((i * 30) + (j * 30) + g++) * i * j) + i - j + 3569222));
for(IrisObjectPlacement k : r.getSurfaceObjects())
{
placeObject(k, i, j, random.nextParallelRNG((34 * ((i * 30) + (j * 30) + g++) * i * j) + i - j + 3569222));
}
}
return g;

5
src/main/java/com/volmit/iris/util/B.java
View File

@ -490,6 +490,11 @@ public class B
public static boolean isAir(BlockData d)
{
if(d == null)
{
return true;
}
return d.getMaterial().equals(Material.AIR) || d.getMaterial().equals(Material.CAVE_AIR) || d.getMaterial().equals(Material.VOID_AIR);
}
}