mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-24 08:05:26 +02:00
Compare commits
4 Commits
ammend-40c
...
fix/player
Author | SHA1 | Date | |
---|---|---|---|
![]() |
5b060be682 | ||
![]() |
622434871d | ||
![]() |
04f38287ce | ||
![]() |
42c5f38788 |
@@ -33,7 +33,6 @@ import com.plotsquared.core.plot.PlotArea;
|
||||
import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.BreakFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
|
||||
@@ -587,12 +586,6 @@ public class BlockEventListener implements Listener {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
if (event.getNewState().getType().toString().endsWith("CONCRETE")) {
|
||||
if (!plot.getFlag(ConcreteHardenFlag.class)) {
|
||||
plot.debug("Concrete powder could not harden because concrete-harden = false");
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
|
@@ -72,7 +72,7 @@ tasks {
|
||||
opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
|
||||
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
||||
opt.links("https://checkerframework.org/api/")
|
||||
opt.links("https://javadocs.dev/com.intellectualsites.informative-annotations/informative-annotations/latest")
|
||||
opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")
|
||||
opt.isLinkSource = true
|
||||
opt.bottom(File("$rootDir/javadocfooter.html").readText())
|
||||
opt.isUse = true
|
||||
|
@@ -517,7 +517,6 @@ public class ListCmd extends SubCommand {
|
||||
}
|
||||
}
|
||||
finalResolver.tag("players", Tag.inserting(builder.asComponent()));
|
||||
finalResolver.tag("size", Tag.inserting(Component.text(plot.getConnectedPlots().size())));
|
||||
caption.set(TranslatableCaption.of("info.plot_list_item"));
|
||||
caption.setTagResolvers(finalResolver.build());
|
||||
}
|
||||
|
@@ -29,7 +29,6 @@ import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.BreakFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.ChatFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
|
||||
@@ -143,7 +142,6 @@ public final class GlobalFlagContainer extends FlagContainer {
|
||||
this.addFlag(BeaconEffectsFlag.BEACON_EFFECT_TRUE);
|
||||
this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
|
||||
this.addFlag(ChatFlag.CHAT_FLAG_TRUE);
|
||||
this.addFlag(ConcreteHardenFlag.CONCRETE_HARDEN_TRUE);
|
||||
this.addFlag(CopperOxideFlag.COPPER_OXIDE_FALSE);
|
||||
this.addFlag(CoralDryFlag.CORAL_DRY_FALSE);
|
||||
this.addFlag(CropGrowFlag.CROP_GROW_TRUE);
|
||||
|
@@ -1,39 +0,0 @@
|
||||
/*
|
||||
* PlotSquared, a land and world management plugin for Minecraft.
|
||||
* Copyright (C) IntellectualSites <https://intellectualsites.com>
|
||||
* Copyright (C) IntellectualSites team and contributors
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.plotsquared.core.plot.flag.implementations;
|
||||
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.plot.flag.types.BooleanFlag;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
public class ConcreteHardenFlag extends BooleanFlag<ConcreteHardenFlag> {
|
||||
|
||||
public static final ConcreteHardenFlag CONCRETE_HARDEN_TRUE = new ConcreteHardenFlag(true);
|
||||
public static final ConcreteHardenFlag CONCRETE_HARDEN_FALSE = new ConcreteHardenFlag(false);
|
||||
|
||||
private ConcreteHardenFlag(boolean value) {
|
||||
super(value, TranslatableCaption.of("flags.flag_description_concrete_harden"));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ConcreteHardenFlag flagOf(@NonNull Boolean value) {
|
||||
return value ? CONCRETE_HARDEN_TRUE : CONCRETE_HARDEN_FALSE;
|
||||
}
|
||||
|
||||
}
|
@@ -183,7 +183,7 @@ public class ChunkCoordinatorBuilder {
|
||||
* Set whether the chunks should be allow to unload after being accessed. This should only be used where the chunks are read from
|
||||
* and then written to from a separate queue where they're consequently unloaded.
|
||||
*
|
||||
* @param unloadAfter if to unload chunks afterwards
|
||||
* @param unloadAfter if to unload chuns afterwards
|
||||
* @return this ChunkCoordinatorBuilder instance
|
||||
*/
|
||||
public @NonNull ChunkCoordinatorBuilder unloadAfter(final boolean unloadAfter) {
|
||||
|
@@ -42,14 +42,28 @@ public class EntityUtil {
|
||||
}
|
||||
|
||||
private static int capNumeral(final @NonNull String flagName) {
|
||||
return switch (flagName) {
|
||||
case "mob-cap" -> CAP_MOB;
|
||||
case "hostile-cap" -> CAP_MONSTER;
|
||||
case "animal-cap" -> CAP_ANIMAL;
|
||||
case "vehicle-cap" -> CAP_VEHICLE;
|
||||
case "misc-cap" -> CAP_MISC;
|
||||
default -> CAP_ENTITY;
|
||||
};
|
||||
int i;
|
||||
switch (flagName) {
|
||||
case "mob-cap":
|
||||
i = CAP_MOB;
|
||||
break;
|
||||
case "hostile-cap":
|
||||
i = CAP_MONSTER;
|
||||
break;
|
||||
case "animal-cap":
|
||||
i = CAP_ANIMAL;
|
||||
break;
|
||||
case "vehicle-cap":
|
||||
i = CAP_VEHICLE;
|
||||
break;
|
||||
case "misc-cap":
|
||||
i = CAP_MISC;
|
||||
break;
|
||||
case "entity-cap":
|
||||
default:
|
||||
i = CAP_ENTITY;
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
@@ -188,7 +188,6 @@ public final class PlaceholderRegistry {
|
||||
}
|
||||
});
|
||||
this.createPlaceholder("currentplot_biome", (player, plot) -> plot.getBiomeSynchronous().toString());
|
||||
this.createPlaceholder("currentplot_size", (player, plot) -> String.valueOf(plot.getConnectedPlots().size()));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -551,7 +551,6 @@
|
||||
"flags.flag_description_block_burn": "<gray>Set to `true` to allow blocks to burn within the plot.</gray>",
|
||||
"flags.flag_description_block_ignition": "<gray>Set to `false` to prevent blocks from igniting within the plot.</gray>",
|
||||
"flags.flag_description_break": "<gray>Define a list of materials players should be able to break even when they aren't added to the plot.</gray>",
|
||||
"flags.flag_description_concrete_harden": "<gray>Set to `false` to disable concrete powder forming to concrete with water.</gray>",
|
||||
"flags.flag_description_device_interact": "<gray>Set to `true` to allow devices to be interacted with in the plot.</gray>",
|
||||
"flags.flag_description_disable_physics": "<gray>Set to `true` to disable block physics in the plot.</gray>",
|
||||
"flags.flag_description_drop_protection": "<gray>Set to `true` to prevent dropped items from being picked up by non-members of the plot.</gray>",
|
||||
|
@@ -150,26 +150,22 @@ subprojects {
|
||||
id.set("Sauilitired")
|
||||
name.set("Alexander Söderberg")
|
||||
organization.set("IntellectualSites")
|
||||
organizationUrl.set("https://github.com/IntellectualSites")
|
||||
}
|
||||
developer {
|
||||
id.set("NotMyFault")
|
||||
name.set("Alexander Brandes")
|
||||
organization.set("IntellectualSites")
|
||||
organizationUrl.set("https://github.com/IntellectualSites")
|
||||
email.set("contact(at)notmyfault.dev")
|
||||
}
|
||||
developer {
|
||||
id.set("SirYwell")
|
||||
name.set("Hannes Greule")
|
||||
organization.set("IntellectualSites")
|
||||
organizationUrl.set("https://github.com/IntellectualSites")
|
||||
}
|
||||
developer {
|
||||
id.set("dordsor21")
|
||||
name.set("dordsor21")
|
||||
organization.set("IntellectualSites")
|
||||
organizationUrl.set("https://github.com/IntellectualSites")
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user