mirror of
https://github.com/ryderbelserion/SimpleFlags.git
synced 2026-11-05 17:42:32 -05:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28c1fd6d42 | ||
|
|
cb0311a524 |
No files matched your search
@@ -1,4 +1,4 @@
|
||||
name: Release Build
|
||||
name: Snapshot Build
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
+1
-4
@@ -1,4 +1 @@
|
||||
## Additions:
|
||||
- Added 2 new flags
|
||||
- A flag to prevent interacting with crafter blocks
|
||||
- A flag to prevent placing crafter blocks
|
||||
- Fixed a bug with drowning listener which canceled all forms of damage as the damage type wasn't properly checked.
|
||||
+1
-1
@@ -15,7 +15,7 @@ mascot_name = Beidou
|
||||
mascot_avatar = https://raw.githubusercontent.com/ryderbelserion/Branding/refs/heads/main/beidou/christmas/emojis/padoru.png
|
||||
|
||||
# The version of the plugin
|
||||
plugin_version = 1.1.0
|
||||
plugin_version = 1.1.1
|
||||
# The api version
|
||||
api_version = 0.1.0
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ public abstract class StateFlagBuilder extends FlagBuilder<StateFlag> {
|
||||
* @return true or false
|
||||
*/
|
||||
public boolean preventDamage(Player player, DamageSource source, DamageType type, StateFlag flag) {
|
||||
return source.getDamageType() == type && testLocation(player, flag);
|
||||
return source.getDamageType() != type || testLocation(player, flag);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.ryderbelserion.simpleflags.flags.builders.StateFlagBuilder;
|
||||
import com.ryderbelserion.simpleflags.flags.FlagManager;
|
||||
import com.ryderbelserion.simpleflags.flags.enums.CustomFlags;
|
||||
import com.sk89q.worldguard.protection.flags.StateFlag;
|
||||
import org.bukkit.damage.DamageSource;
|
||||
import org.bukkit.damage.DamageType;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
@@ -37,7 +38,9 @@ public class DrowningListener implements Listener {
|
||||
|
||||
if (stateFlag == null) return;
|
||||
|
||||
if (!flag.preventDamage(player, event.getDamageSource(), DamageType.DROWN, stateFlag)) {
|
||||
final DamageSource source = event.getDamageSource();
|
||||
|
||||
if (!flag.preventDamage(player, source, DamageType.DROWN, stateFlag)) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user