Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix act for scripts that reset to initial state after some time

Browse Source
This commit is contained in:
P0nk
2022-08-29 22:46:46 +02:00
parent 17ae269cc9
commit 7fa677d766
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/reactor/2119004.js
View File

@@ -19,6 +19,6 @@
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
function hit() { function act() {
rm.weakenAreaBoss(6090001, "The light at the altar appeases the hatred of the Snow Witch. The force of the Witch has weakened."); rm.weakenAreaBoss(6090001, "The light at the altar appeases the hatred of the Snow Witch. The force of the Witch has weakened.");
} }

2
scripts/reactor/2119005.js
View File

@@ -19,6 +19,6 @@
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
function hit() { function act() {
rm.weakenAreaBoss(6090001, "The light at the altar appeases the hatred of the Snow Witch. The force of the Witch has weakened."); rm.weakenAreaBoss(6090001, "The light at the altar appeases the hatred of the Snow Witch. The force of the Witch has weakened.");
} }

2
scripts/reactor/2119006.js
View File

@@ -19,6 +19,6 @@
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
function hit() { function act() {
rm.weakenAreaBoss(6090001, "The light at the altar appeases the hatred of the Snow Witch. The force of the Witch has weakened."); rm.weakenAreaBoss(6090001, "The light at the altar appeases the hatred of the Snow Witch. The force of the Witch has weakened.");
} }

7
src/main/java/server/maps/Reactor.java
View File

@@ -270,8 +270,11 @@ public class Reactor extends AbstractMapObject {
continue; continue;
} }
} }
state = stats.getNextState(state, b);
if (stats.getNextState(state, b) == -1) {//end of reactor this.state = stats.getNextState(state, b);
byte nextState = stats.getNextState(state, b);
boolean isInEndState = nextState < this.state;
if (isInEndState) {//end of reactor
if (reactorType < 100) {//reactor broken if (reactorType < 100) {//reactor broken
if (delay > 0) { if (delay > 0) {
map.destroyReactor(getObjectId()); map.destroyReactor(getObjectId());