Skip to content

Commit 7bb3232

Browse files
committed
Merge remote-tracking branch 'origin/development' into development
2 parents 5f3683e + 0cf89e0 commit 7bb3232

File tree

7 files changed

+21
-42
lines changed

7 files changed

+21
-42
lines changed

docs/BedWars2023/addons.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ If you encounter any issues regarding addons for BedWars, make sure to contact t
1515
[//]: # (### Premium Addons)
1616
[//]: # (- [none](#) - #)
1717

18-
[//]: # (### Free Addons)
19-
[//]: # (- [none](#) - #)
18+
### Free Addons
19+
- [Private Games for BedWars2023](https://discord.gg/YA3q8tFU7e) - by Kiiya
20+
- [Map break for BedWars2023](https://discord.gg/9zjjUrfuSF) - by Kiiya
21+
- [Hotbar Manager for BedWars2023](https://discord.gg/sgHFSdtznH) - by Kiiya
22+
- [Cosmetics for BedWars2023](https://www.spigotmc.org/resources/bedwars-cosmetics.106685/) - by IAmTheDefender
23+
- [GroupStats for BedWars2023](https://polymart.org/resource/bedwars2023-groupstats.5904) - by Lagggpixel
2024

2125
[//]: # (## Pre-made Setups)
2226

docs/BedWars2023/compatibility.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ Only versions listed below are officially supported
1212
* **1.16.5** (v1_16_R3)
1313
* **1.17.1** (v1_17_R1)
1414
* **1.18.2** (v1_18_R2)
15-
* **1.19.3** (v1_19_R2)
15+
* **1.19.4** (v1_19_R3)
1616
* **1.20.1** (v1_20_R1)
17+
* **1.20.2** (v1_20_R2)
18+
* **1.20.3** (v1_20_R3)
19+
* **1.20.4** (v1_20_R4)
1720

1821
## Minimum Java Versions
1922
Java 11 or newer is required for BedWars2023.

docs/BedWars2023/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Make sure you have `spawn-npcs` set to `true` in `server.properties`, also if yo
1414
If you are not able to place blocks in some places, make sure it's not a BedWars rule. If it is normal not to be able to break, you will receive a message. In other cases you might have `spawn-protection` activated, and it won't allow you to build at the map's spawn. In this case, please set `spawn-protection` to `0` in `server.properties`. If this didn't work, please make sure you didn't set the BedWars **main lobby** in the arena world, because it will prevent players from doing pvp, build etc..
1515

1616
### Why can't I pvp?
17-
Please make sure you didn't set the BedWars **main lobby** in the arena world, because it will prevent players from doing pvp, build etc. If you're using `MultiVerse` Plugin, make sure not to have the `pvp` flag disabled, same thing if you're using `WorldGuard` Plugin (it would be better if you remove any regions from BedWars arenas). If you don't have those plugins or if it did not work, set `difficulty` higher than `0` in `server.properties` if you haven't already!
17+
Please make sure you didn't set the BedWars **main lobby** in the arena world, because it will prevent players from doing pvp, build etc. If you're using `MultiVerse` Plugin, make sure not to have the `pvp` flag disabled, same thing if you're using `WorldGuard` Plugin (it would be better if you remove any regions from BedWars arenas). If you don't have those plugins or if it did not work, set `difficulty` higher than `0` and `pvp` to `true` in `server.properties` if you haven't already!
1818

1919
### My arenas don't reset, why?
2020
Read about this [here](setup/creating-arenas#map-resetting-system)

docs/BedWars2023/home.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sidebar_position: 0
55
sidebar_label: Home
66
---
77

8-
[![Discord](https://img.shields.io/discord/760851292826107926)](https://discord.gg/kPaBGwhmjf/)
8+
[![Discord](https://img.shields.io/discord/760851292826107926)](https://discord.gg/kPaBGwhmjf)
99
[![Servers](https://img.shields.io/bstats/servers/18317)](https://bstats.org/plugin/bukkit/BedWars2023/)
1010

1111
Welcome to the BedWars2023 wiki. Here you will find a complete set of documentation for the plugin, outlining how to install, setup, configure and effectively use BedWars2023.

docs/BedWars2023/hooks/swm-hook.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ For Minecraft 1.8.8 - 1.14.4, you can use [SlimeWorldManager](https://www.spigot
99

1010
For Minecraft 1.17.1 - 1.18.2 you can use [AdvancedSlimeWorldManager](https://www.spigotmc.org/resources/advanced-slimeworldmanager.87209/)
1111

12+
For PaperMC 1.20.x you can use [AdvancedSlimePaper](https://discord.com/invite/YevvsMa)
1213

1314
Bedwars2023 will automatically convert any arena worlds into slime worlds.

docs/BedWarsProxy/features/placeholders.md

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ Placeholders that can be used on supported plugins.
1010
| `%bw2023_group_count_<group>%` | Show the amount of players in an arena group. |
1111
| `%bw2023_stats_firstplay%` | Show a player first play date. |
1212
| `%bw2023_stats_lastplay%` | Show a player last play date. |
13-
| `%bw2023_stats_kills%` | Show player kills. |
13+
| `%bw2023_stats_kills%` | Show player regular kills. |
14+
| `%bw2023_stats_total_kills%` | Show a player total kill (Regular + Final) |
1415
| `%bw2023_stats_wins%` | Show player wins. |
1516
| `%bw2023_stats_finalkills%` | Show player final kills. |
1617
| `%bw2023_stats_deaths%` | Show player deaths. |
@@ -21,42 +22,12 @@ Placeholders that can be used on supported plugins.
2122
| `%bw2023_current_online%` | Show amount of players in arenas. |
2223
| `%bw2023_current_arenas%` | Show amount of active arenas. |
2324
| `%bw2023_player_level%` | Show a player level number. |
25+
| `%bw2023_player_level_trim%` | Show a player level number but remove unnecessary spaces at the end |
26+
| `%bw2023_player_level_strip%` | Show a player level number but remove the bracket [] |
27+
| `%bw2023_player_level_strip_trim%` | Effect is the combination of the two placeholders above |
28+
| `%bw2023_player_level_raw%` | Show a player level number (Number only for leaderboard) |
2429
| `%bw2023_player_progress%` | Show a player progress bar. |
25-
| `%bw2023_player_xp_formated%` | Show a player formatted xp. |
30+
| `%bw2023_player_xp_formatted%` | Show a player formatted xp. |
2631
| `%bw2023_player_xp%` | Show a player xp number. |
2732
| `%bw2023_player_req_xp_formatted%` | Show a player required xp, formatted. |
2833
| `%bw2023_player_req_xp%` | Show a player required xp number. |
29-
| `%bw2023_team_letter%` | Returns the first letter of the display name of the team the player is in. |
30-
| `%bw2023_team_color%` | Returns the colour of the team the player is in. |
31-
| `%bw2023_team_status%` | Returns the status (✓, or ×) of the team the player is in. |
32-
| `%bw2023_team_players_amount%` | Returns the number of players in the team. |
33-
| `%bw2023_team_players%` | Returns the players in the team, which the player is in, in the form of a String with names separated by ", ". |
34-
| `%bw2023_team_letter_%` | Returns the first letter of the display name of the teM the player specified is in. |
35-
| `%bw2023_team_color_%` | Returns the colour of the team the player specified is in. |
36-
| `%bw2023_team_status_%` | Returns the status (✓, or ×) of the team the player specified is in. |
37-
| `%bw2023_team_players_amount_%` | Returns the number of players in the team the player specified is in. |
38-
| `%bw2023_team_players_%` | Returns the players in the team, which the player specified is in, in the form of a String with names separated by ", ". |
39-
| `%bw2023_arena_nextevent_name%` | Returns the name of the next event of the arena the player is in. |
40-
| `%bw2023_arena_nextevent_time%` | Returns the time left till the next event of the arena the player is in, in raw form as String. |
41-
| `%bw2023_arena_nextevent_time_formatted%` | Returns the time left till the next event of the arena the player is in, in formatted form as String. |
42-
| `%bw2023_arena_name%` | Returns the name of the arena the player is in. |
43-
| `%bw2023_arena_displayName%` | Returns the display name of the arena the player is in. |
44-
| `%bw2023_arena_group%` | Returns the group the arena, which the player is in, is in. |
45-
| `%bw2023_arena_world%` | Returns the world the arena, which the player is in, is in. |
46-
| `%bw2023_arena_status_plocale%` | Returns the status of the arena in the player's chosen language. |
47-
| `%bw2023_arena_status%` | Returns the status of the arena in the default language. |
48-
| `%bw2023_player_kills%` | Returns the number of kills the player has done in that particular game. |
49-
| `%bw2023_player_kills_final%` | Returns the number of final kills the player has done in that particular game. |
50-
| `%bw2023_player_kills_total%` | Returns the total number of kills (kills + final kills) the player has done in that particular game. |
51-
| `%bw2023_player_deaths%` | Returns the number of times the player has died in that particular game. |
52-
| `%bw2023_player_deaths_final%` | Returns the number of times the player has died the final time in that particular game. (Supposed to be always less than or equal to 1) |
53-
| `%bw2023_player_deaths_total%` | Returns the total number of times the player has died (deaths + final deaths) in that particular game. |
54-
| `%bw2023_player_beds%` | Returns the number of beds the player has broken in that particular game. |
55-
| `%bw2023_players%` | Returns the players in the arena, which the player is in, in the form of a String with names separated by ", ". |
56-
| `%bw2023_players_amount%` | Returns the number of players in the arena the player is in. |
57-
| `%bw2023_party_has%` | Returns "true" if the player is in a party and "false" if the player is not. |
58-
| `%bw2023_party_members%` | Returns the members of the party, which the player is in, in the form of a String with names separated by ", ". |
59-
| `%bw2023_party_members_amount%` | Returns the number of members of the party the player is in. |
60-
| `%bw2023_party_in_yours_%` | Returns "true" if the target specified is in the player's party and "false" if not. |
61-
| `%bw2023_party_in_his_%` | Returns "true" if the player is in the target's party and "false" if not. |
62-
| `%bw2023_party_is_owner%` | Returns "true" if the player is the owner of his party and "false" if not. |

docs/BedWarsProxy/home.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sidebar_position: 0
55
sidebar_label: Home
66
---
77

8-
[![Discord](https://img.shields.io/discord/760851292826107926)](https://discord.gg/kPaBGwhmjf/)
8+
[![Discord](https://img.shields.io/discord/760851292826107926)](https://discord.gg/kPaBGwhmjf)
99
[![Servers](https://img.shields.io/bstats/servers/18317)](https://bstats.org/plugin/bukkit/BedWars2023/)
1010

1111
Welcome to the BedWarsProxy wiki. Here you will find a complete set of documentation for the plugin, outlining how to install, setup, configure and effectively use BedWarsProxy in combination with BedWars2023.

0 commit comments

Comments
 (0)