Various Fixes #127

Merged
SenseiKiwi merged 9 commits from master into master 2014-01-19 06:07:38 +00:00

9 Commits

Author SHA1 Message Date
SenseiKiwi
37a10e5795 Resolved Merge Conflicts Again
...
2014-01-19 01:51:21 -04:00
SenseiKiwi
15cfe6fc33 Resolved Merge Conflicts
Resolved some merge conflicts.
2014-01-19 00:20:14 -04:00
SenseiKiwi
8416d650b1 Changed ID Source in BaseGateway
Changed where we get block IDs from for GatewayBlockFilter. DDProperties
always has correct block IDs. It's only item IDs that are modified by
Forge so that DDProperties is wrong.
2014-01-14 07:32:42 -04:00
SenseiKiwi
5df79bb206 Fixed ID Mapping in DungeonSchematic
Fixed issue with DungeonSchematic not standardizing the block IDs for
transient doors.
2014-01-14 07:22:51 -04:00
SenseiKiwi
75db61e951 Minor Change
There is no resource leak!
2014-01-14 07:18:05 -04:00
SenseiKiwi
1b2a119aa7 Fixed Placement in BaseGateway
Fixed bad gateway placement in BaseGateway. Also improved code spacing a
little. This doesn't fix the block ID issue yet.
2014-01-14 06:48:33 -04:00
SenseiKiwi
76f515e207 Minor Changes
Tweaked spacing in files.
2014-01-14 06:46:42 -04:00
SenseiKiwi
e45f9c389f Merge remote-tracking branch 'upstream/master' 2014-01-14 05:50:17 -04:00
SenseiKiwi
a1a5c0908a Fixes for Rifts
Fixed a bug I introduced during my previous commit that caused solo
rifts to spread and rifts with neighbors not to spread. Also cleaned up
the code a bit to cut back on the number of mysterious random rolls we
were using and commented the code.
2014-01-14 05:47:26 -04:00