nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-23 15:20:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
Final Patch to totems, resolves the NumberFormatException for all Totems....

See merge request morningstar/Arcturus-Community!67
This commit is contained in:
Harmonic 2020-01-17 15:11:38 -05:00
commit cd2505ebf7
5 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.eu.habbo</groupId>
<artifactId>Habbo</artifactId>
<version>2.2.0</version>
<version>2.2.2</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

6
sqlupdates/2_2_1_TO_2_2_2.sql Normal file
View File

@ -0,0 +1,6 @@
UPDATE items_base SET interaction_type = 'totem_leg' WHERE item_name = 'totem_leg';
UPDATE items_base SET interaction_type = 'totem_head' WHERE item_name = 'totem_head';
UPDATE items_base SET interaction_type = 'totem_planet' WHERE item_name = 'totem_planet';
UPDATE items_base SET interaction_modes_count = '3' WHERE item_name = 'totem_planet';
UPDATE items_base SET interaction_modes_count = '12' WHERE item_name = 'totem_leg';
UPDATE items_base SET interaction_modes_count = '9' WHERE item_name = 'totem_head';

2
src/main/java/com/eu/habbo/Emulator.java
View File

@ -34,7 +34,7 @@ public final class Emulator {
public final static int MINOR = 2;
public final static int BUILD = 1;
public final static int BUILD = 2;
public final static String PREVIEW = "Stable";

7
src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemLegs.java
View File

@ -21,7 +21,12 @@ public class InteractionTotemLegs extends InteractionDefault {
}
public TotemType getTotemType() {
int extraData = Integer.parseInt(this.getExtradata());
int extraData;
try {
extraData = Integer.parseInt(this.getExtradata());
} catch(NumberFormatException ex) {
extraData = 0;
}
return TotemType.fromInt((int)Math.ceil((extraData + 1) / 4.0f));
}

7
src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemPlanet.java
View File

@ -22,7 +22,12 @@ public class InteractionTotemPlanet extends InteractionDefault {
}
public TotemPlanetType getPlanetType() {
int extraData = Integer.parseInt(this.getExtradata());
int extraData;
try {
extraData = Integer.parseInt(this.getExtradata());
} catch(NumberFormatException ex) {
extraData = 0;
}
return TotemPlanetType.fromInt(extraData);
}