Permalink
Browse files

normal shootDelay in creative mode

  • Loading branch information...
1 parent a071061 commit f7357661ecbe41b45ebe7bd9d3108c5c86698167 @master-lincoln master-lincoln committed Mar 7, 2012
View
3 src/com/mojang/mojam/entity/weapon/Raygun.java
@@ -16,11 +16,10 @@ public Raygun(Mob owner) {
@Override
public void setWeaponMode() {
+ super.setWeaponMode();
if (Options.getAsBoolean(Options.CREATIVE)) {
bulletDamage = 100f;
accuracy = 0;
- } else {
- super.setWeaponMode();
}
}
View
2 src/com/mojang/mojam/entity/weapon/Rifle.java
@@ -35,13 +35,13 @@ public Rifle(Mob mob) {
}
public void setWeaponMode() {
+ shootDelay = Constants.getInt("shootDelay", this);
if (Options.getAsBoolean(Options.CREATIVE)) {
bulletDamage = 100f;
accuracy = 0;
} else {
bulletDamage = Constants.getFloat("bulletDamage", this);
accuracy = Constants.getDouble("accuracy", this);
- shootDelay = Constants.getInt("shootDelay", this);
}
}
View
3 src/com/mojang/mojam/entity/weapon/Shotgun.java
@@ -26,11 +26,10 @@ public Shotgun(Mob owner) {
@Override
public void setWeaponMode(){
+ super.setWeaponMode();
if(Options.getAsBoolean(Options.CREATIVE)){
bulletDamage = 100f;
accuracy = 0.06;
- }else{
- super.setWeaponMode();
}
}

0 comments on commit f735766

Please sign in to comment.