Skip to content

fix bluemap nullptr #61

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

Open
wants to merge 1 commit into
base: 1.21.6
Choose a base branch
from
Open

fix bluemap nullptr #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion src/main/java/eu/midnightdust/motschen/rocks/block/polymer/NetherGeyserPolymer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,20 @@ public NetherGeyserPolymer(Identifier blockId) {
public BlockState getPolymerBlockState(BlockState state) {
return PolyUtil.SMALL_BLOCK;
}

@Override
public BlockState getPolymerBlockState(BlockState state, PacketContext context) {
if (context == null) {
return getPolymerBlockState(state);
}
return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state);
}

@Override
public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) {
if (context == null) {
return Blocks.NETHERRACK.getDefaultState();
}
return hasModOnClient(context.getPlayer()) ? state : Blocks.NETHERRACK.getDefaultState();
}

Expand All @@ -42,6 +49,11 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext
}

@Override
public boolean canSyncRawToClient(PacketContext context) {return hasModOnClient(context.getPlayer());}
public boolean canSyncRawToClient(PacketContext context) {
if (context == null) {
return false;
}
return hasModOnClient(context.getPlayer());
}

}
9 changes: 9 additions & 0 deletions src/main/java/eu/midnightdust/motschen/rocks/block/polymer/OverworldGeyserPolymer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,17 @@ public BlockState getPolymerBlockState(BlockState state) {
}
@Override
public BlockState getPolymerBlockState(BlockState state, PacketContext context) {
if (context==null) {
return getPolymerBlockState(state);
}
return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state);
}

@Override
public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) {
if (context == null) {
return Blocks.SNOW.getDefaultState();
}
return hasModOnClient(context.getPlayer()) ? state : Blocks.SNOW.getDefaultState();
}

Expand All @@ -43,6 +49,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext

@Override
public boolean canSyncRawToClient(PacketContext context) {
if (context == null) {
return false;
}
return hasModOnClient(context.getPlayer());
}
}
9 changes: 9 additions & 0 deletions src/main/java/eu/midnightdust/motschen/rocks/block/polymer/PineconePolymer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,17 @@ public BlockState getPolymerBlockState(BlockState state) {
}
@Override
public BlockState getPolymerBlockState(BlockState state, PacketContext context) {
if (context==null) {
return getPolymerBlockState(state);
}
return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state);
}

@Override
public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) {
if (context==null) {
return Blocks.SPRUCE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR);
}
return hasModOnClient(context.getPlayer()) ? state : Blocks.SPRUCE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR);
}

Expand All @@ -45,6 +51,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext

@Override
public boolean canSyncRawToClient(PacketContext context) {
if (context == null) {
return false;
}
return hasModOnClient(context.getPlayer());
}
}
9 changes: 9 additions & 0 deletions src/main/java/eu/midnightdust/motschen/rocks/block/polymer/RockPolymer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,17 @@ public BlockState getPolymerBlockState(BlockState state) {
}
@Override
public BlockState getPolymerBlockState(BlockState state, PacketContext context) {
if (context==null) {
return getPolymerBlockState(state);
}
return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state);
}

@Override
public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) {
if (context==null) {
return Blocks.STONE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR);
}
return hasModOnClient(context.getPlayer()) ? state : Blocks.STONE_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR);
}

Expand All @@ -45,6 +51,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext

@Override
public boolean canSyncRawToClient(PacketContext context) {
if (context == null) {
return false;
}
return hasModOnClient(context.getPlayer());
}
}
9 changes: 9 additions & 0 deletions src/main/java/eu/midnightdust/motschen/rocks/block/polymer/SeashellPolymer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,17 @@ public BlockState getPolymerBlockState(BlockState state) {
}
@Override
public BlockState getPolymerBlockState(BlockState state, PacketContext context) {
if (context==null) {
return getPolymerBlockState(state);
}
return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state);
}

@Override
public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) {
if (context==null) {
return Blocks.WHITE_CANDLE.getDefaultState();
}
return hasModOnClient(context.getPlayer()) ? state : Blocks.WHITE_CANDLE.getDefaultState();
}

Expand All @@ -44,6 +50,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext

@Override
public boolean canSyncRawToClient(PacketContext context) {
if (context == null) {
return false;
}
return hasModOnClient(context.getPlayer());
}
}
9 changes: 9 additions & 0 deletions src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StarfishPolymer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,17 @@ public BlockState getPolymerBlockState(BlockState state) {
}
@Override
public BlockState getPolymerBlockState(BlockState state, PacketContext context) {
if (context==null) {
return getPolymerBlockState(state);
}
return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state);
}

@Override
public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) {
if (context==null) {
return Blocks.SEA_PICKLE.getDefaultState();
}
return hasModOnClient(context.getPlayer()) ? state : Blocks.SEA_PICKLE.getDefaultState();
}

Expand All @@ -44,6 +50,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext

@Override
public boolean canSyncRawToClient(PacketContext context) {
if (context == null) {
return false;
}
return hasModOnClient(context.getPlayer());
}
}
9 changes: 9 additions & 0 deletions src/main/java/eu/midnightdust/motschen/rocks/block/polymer/StickPolymer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,17 @@ public BlockState getPolymerBlockState(BlockState state) {
}
@Override
public BlockState getPolymerBlockState(BlockState state, PacketContext context) {
if (context==null) {
return getPolymerBlockState(state);
}
return hasModOnClient(context.getPlayer()) ? state : getPolymerBlockState(state);
}

@Override
public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext context) {
if (context==null) {
return Blocks.OAK_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR);
}
return hasModOnClient(context.getPlayer()) ? state : Blocks.OAK_BUTTON.getDefaultState().with(Properties.BLOCK_FACE, BlockFace.FLOOR);
}

Expand All @@ -45,6 +51,9 @@ public BlockState getPolymerBreakEventBlockState(BlockState state, PacketContext

@Override
public boolean canSyncRawToClient(PacketContext context) {
if (context==null) {
return false;
}
return hasModOnClient(context.getPlayer());
}
}