Skip to content

Update minigame to Minecraft 1.21.5 #7

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
haykam821 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update minigame to Minecraft 1.21.5 #7

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
8 changes: 4 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ mod_version = 1.0.0
org.gradle.jvmargs = -Xmx1G

# Versions
minecraft_version = 1.21.4
yarn_mappings = 1.21.4+build.8
minecraft_version = 1.21.5
yarn_mappings = 1.21.5+build.1
loader_version = 0.16.14
fabric_version = 0.119.2+1.21.4
fabric_version = 0.123.2+1.21.5

plasmid_version = 0.6.3+1.21.4
plasmid_version = 0.6.4+1.21.5
2 changes: 1 addition & 1 deletion src/main/java/io/github/haykam821/paintball/game/item/PaintballLauncherItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private SoundEvent getLaunchSound(World world, ServerPlayerEntity player) {
}

private ProjectileEntity createDefaultProjectile(World world, ServerPlayerEntity player) {
DyeColor color = DyeColor.byId(world.getRandom().nextInt(DYE_COLORS));
DyeColor color = DyeColor.byIndex(world.getRandom().nextInt(DYE_COLORS));
if (color == null) {
color = DyeColor.WHITE;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/github/haykam821/paintball/game/map/PaintballMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private JoinAcceptorResult.Teleport acceptJoins(JoinAcceptor acceptor, ServerWor

private JoinAcceptorResult.Teleport acceptJoins(JoinAcceptor acceptor, ServerWorld world, TemplateRegion region) {
Vec3d pos = region.getBounds().centerBottom();
float facing = region.getData().getFloat(FACING_KEY);
float facing = region.getData().getFloat(FACING_KEY, 0);

return acceptor.teleport(world, pos).thenRunForEach(player -> {
player.setYaw(facing);
Expand All @@ -72,7 +72,7 @@ public boolean teleportToSpawn(ServerPlayerEntity player, String marker) {

private void teleportToSpawn(ServerPlayerEntity player, TemplateRegion region) {
Vec3d pos = region.getBounds().centerBottom();
float facing = region.getData().getFloat(FACING_KEY);
float facing = region.getData().getFloat(FACING_KEY, 0);

player.teleport(player.getServerWorld(), pos.getX(), pos.getY(), pos.getZ(), Set.of(), facing, 0, true);
}
Expand Down