Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent players from getting doors as observers #1488

Draft
wants to merge 4 commits into
base: dev
Choose a base branch
from
Draft

Prevent players from getting doors as observers #1488

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
936ff4c
Prevent players for acquiring doors in observer
OhPointFive Feb 3, 2025
1059184
Replace forbidden type list with a matcher
OhPointFive Feb 3, 2025
9656494
Simplify door check
OhPointFive Feb 7, 2025
67ff60d
Merge branch 'dev' into fix-dangerous-item-list
Pablete1234 Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/tc/oc/pgm/api/setting/SettingKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void update(MatchPlayer player) {
PICKER_MANUAL), // Changes when the picker is displayed
JOIN(
Arrays.asList("join", "jms"),
Materials.WOOD_DOOR,
Materials.WOOD_DOOR_ITEM,
JOIN_ON,
JOIN_FRIENDS,
JOIN_OFF), // Changes if join messages are seen
Expand Down
14 changes: 12 additions & 2 deletions core/src/main/java/tc/oc/pgm/spawns/states/Observing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,18 @@ public class Observing extends State {

// A set of item types which, when used to interact with the match environment by non-playing
// users, can potentially cause client-server de-sync
private static final Set<Material> BAD_TYPES =
EnumSet.of(Materials.LILY_PAD, Material.BUCKET, Material.LAVA_BUCKET, Material.WATER_BUCKET);
private static final Set<Material> BAD_TYPES = EnumSet.of(
Materials.LILY_PAD,
Material.BUCKET,
Material.LAVA_BUCKET,
Material.WATER_BUCKET,
Materials.WOOD_DOOR_ITEM,
Materials.IRON_DOOR_ITEM,
Materials.ACACIA_DOOR_ITEM,
Materials.JUNGLE_DOOR_ITEM,
Materials.DARK_OAK_DOOR_ITEM,
Materials.SPRUCE_DOOR_ITEM,
Materials.BIRCH_DOOR_ITEM);

private static final double VOID_HEIGHT = -64;

Expand Down
8 changes: 7 additions & 1 deletion util/src/main/java/tc/oc/pgm/util/material/Materials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ public interface Materials {
Material SIGN = parse("SIGN", "OAK_SIGN");
Material SKULL = parse("SKULL_ITEM", "SKELETON_SKULL");
Material PLAYER_HEAD = parse("SKULL_ITEM", "PLAYER_HEAD");
Material WOOD_DOOR = parse("WOOD_DOOR", "OAK_DOOR");
Material WOOD_DOOR_ITEM = parse("WOOD_DOOR", "OAK_DOOR");
Material ACACIA_DOOR_ITEM = parse("ACACIA_DOOR_ITEM", "ACACIA_DOOR");
Material JUNGLE_DOOR_ITEM = parse("JUNGLE_DOOR_ITEM", "JUNGLE_DOOR");
Material DARK_OAK_DOOR_ITEM = parse("DARK_OAK_DOOR_ITEM", "DARK_OAK_DOOR");
Material SPRUCE_DOOR_ITEM = parse("SPRUCE_DOOR_ITEM", "SPRUCE_DOOR");
Material BIRCH_DOOR_ITEM = parse("BIRCH_DOOR_ITEM", "BIRCH_DOOR");
Material IRON_DOOR_ITEM = parse("IRON_DOOR");
Pablete1234 marked this conversation as resolved.
Show resolved Hide resolved
Material BOOK_AND_QUILL = parse("BOOK_AND_QUILL", "WRITABLE_BOOK");
Material EYE_OF_ENDER = parse("EYE_OF_ENDER", "ENDER_EYE");
Material FIREWORK = parse("FIREWORK", "FIREWORK_ROCKET");
Expand Down
Loading