flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

potion parsing error catching

Browse Source
This commit is contained in:
Flemmli97 2021-06-13 18:23:13 +02:00
parent 11d8ab90c8
commit 98cbaed769
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/io/github/flemmli97/flan/claim/Claim.java
View File

@ -487,7 +487,7 @@ public class Claim implements IPermissionContainer {
}
public void applyEffects(ServerPlayerEntity player) {
if (player.world.getTime() % 160 == 0)
if (player.world.getTime() % 80 == 0)
this.potions.forEach((effect, amp) -> {
player.applyStatusEffect(new StatusEffectInstance(effect, 200, amp - 1, true, false));
});

15
common/src/main/java/io/github/flemmli97/flan/gui/PotionEditScreenHandler.java
View File

@ -6,6 +6,7 @@ import io.github.flemmli97.flan.claim.Claim;
import io.github.flemmli97.flan.claim.PermHelper;
import net.minecraft.entity.effect.StatusEffect;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.Inventory;
@ -20,6 +21,7 @@ import net.minecraft.sound.SoundEvents;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Formatting;
import net.minecraft.util.registry.Registry;
import java.util.Collection;
import java.util.Collections;
@ -107,7 +109,18 @@ public class PotionEditScreenHandler extends ServerOnlyScreenHandler<Claim> {
player.closeHandledScreen();
player.getServer().execute(() -> StringResultScreenHandler.createNewStringResult(player, (s) -> {
String[] potion = s.split(";");
this.claim.addPotion(CrossPlatformStuff.effectFromString(potion[0]), Integer.parseInt(potion[1]));
int amp = 1;
StatusEffect effect = CrossPlatformStuff.effectFromString(potion[0]);
if(effect == StatusEffects.LUCK && !potion[0].equals("minecraft:luck")) {
ServerScreenHelper.playSongToPlayer(player, SoundEvents.ENTITY_VILLAGER_NO, 1, 1f);
return;
}
if(potion.length > 1) {
try {
amp = Integer.parseInt(potion[1]);
} catch (NumberFormatException e) {}
}
this.claim.addPotion(effect, amp);
player.closeHandledScreen();
player.getServer().execute(() -> PotionEditScreenHandler.openPotionMenu(player, this.claim));
ServerScreenHelper.playSongToPlayer(player, SoundEvents.BLOCK_ANVIL_USE, 1, 1f);