Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #2877, #2878, add changelog

Browse source
This commit is contained in:
Adrian 2015-07-10 09:46:55 +02:00
parent 51ac62ce7b
commit f81541c8db
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
buildcraft_resources/changelog/7.0.14 Normal file
View file

@ -0,0 +1,10 @@
Bugs fixed:
* [#2878] Robot NPE for robots prior to 7.0.13 fix (asie)
* [#2877] Survival blueprint crash (asie)
* [#2841] Another crash with Oil in the Nether (asie)
* [#2831] Robots sinking through the ground (hea3ven)
* Allow Builders to use arbitrary IPathProviders (asie)
* Block breaking robots sleeping in mid air (hea3ven)
* Incorrect Request Needed Items action name (asie)
* Robots ignoring gate config on their linked station when equipping items (hea3ven)

6
common/buildcraft/core/blueprints/BptBuilderBlueprint.java
View file

@ -265,8 +265,10 @@ public class BptBuilderBlueprint extends BptBuilderBase {
private int getBuildListCount() { private int getBuildListCount() {
int out = 0; int out = 0;
for (int i = 0; i < buildStageOccurences.length; i++) { if (buildStageOccurences != null) {
out += buildStageOccurences[i]; for (int i = 0; i < buildStageOccurences.length; i++) {
out += buildStageOccurences[i];
}
} }
return out; return out;
} }

10
common/buildcraft/robotics/ai/AIRobotGoAndLinkToDock.java
View file

@ -36,7 +36,7 @@ public class AIRobotGoAndLinkToDock extends AIRobot {
if (station == robot.getLinkedStation() && station == robot.getDockingStation()) { if (station == robot.getLinkedStation() && station == robot.getDockingStation()) {
terminate(); terminate();
} else { } else {
if (station.takeAsMain(robot)) { if (station != null && station.takeAsMain(robot)) {
startDelegateAI(new AIRobotGotoBlock(robot, startDelegateAI(new AIRobotGotoBlock(robot,
station.x() + station.side().offsetX * 2, station.x() + station.side().offsetX * 2,
station.y() + station.side().offsetY * 2, station.y() + station.side().offsetY * 2,
@ -52,10 +52,10 @@ public class AIRobotGoAndLinkToDock extends AIRobot {
public void delegateAIEnded(AIRobot ai) { public void delegateAIEnded(AIRobot ai) {
if (ai instanceof AIRobotGotoBlock) { if (ai instanceof AIRobotGotoBlock) {
if (ai.success()) { if (ai.success()) {
startDelegateAI(new AIRobotStraightMoveTo(robot, startDelegateAI(new AIRobotStraightMoveTo(robot,
station.x() + 0.5F + station.side().offsetX * 0.5F, station.x() + 0.5F + station.side().offsetX * 0.5F,
station.y() + 0.5F + station.side().offsetY * 0.5F, station.y() + 0.5F + station.side().offsetY * 0.5F,
station.z() + 0.5F + station.side().offsetZ * 0.5F)); station.z() + 0.5F + station.side().offsetZ * 0.5F));
} else { } else {
terminate(); terminate();
} }