Skip to content

Commit

Permalink
Merge pull request SkriptLang#2514 from Wealthyturtle/patch-9
Browse files Browse the repository at this point in the history
Gender-Neutral Pronouns
  • Loading branch information
bensku authored Oct 10, 2019
2 parents ba20fd5 + ed7d620 commit 389cdcb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ public String getVariableNamePattern() {
.user("players?")
.name("Player")
.description("A player. Depending on whether a player is online or offline several actions can be performed with them, " +
"though you won't get any errors when using effects that only work if the player is online (e.g. changing his inventory) on an offline player.",
"though you won't get any errors when using effects that only work if the player is online (e.g. changing their inventory) on an offline player.",
"You have two possibilities to use players as command arguments: <player> and <offline player>. " +
"The first requires that the player is online and also accepts only part of the name, " +
"while the latter doesn't require that the player is online, but the player's name has to be entered exactly.")
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ch/njol/skript/events/EvtItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ public class EvtItem extends SkriptEvent {
"\tsend \"that'd be 19.99 please!\"")
.since("<i>unknown</i> (before 2.1)");
Skript.registerEvent("Item Spawn", EvtItem.class, ItemSpawnEvent.class, "item spawn[ing] [[of] %itemtypes%]")
.description("Called whenever an item stack is spawned in a world, e.g. as drop of a block or mob, a player throwing items out of his inventory, or a dispenser dispensing an item (not shooting it).")
.description("Called whenever an item stack is spawned in a world, e.g. as drop of a block or mob, a player throwing items out of their inventory, or a dispenser dispensing an item (not shooting it).")
.examples("on item spawn of iron sword:",
"\tbroadcast \"Someone dropped an iron sword!\"")
.since("<i>unknown</i> (before 2.1)");
Skript.registerEvent("Drop", EvtItem.class, PlayerDropItemEvent.class, "[player] drop[ing] [[of] %itemtypes%]")
.description("Called when a player drops an item from his inventory.")
.description("Called when a player drops an item from their inventory.")
.examples("on drop:")
.since("<i>unknown</i> (before 2.1)");
// TODO limit to InventoryAction.PICKUP_* and similar (e.g. COLLECT_TO_CURSOR)
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ch/njol/skript/events/SimpleEvents.java
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,13 @@ public class SimpleEvents {
.since("1.0");
if (Skript.classExists("org.bukkit.event.player.PlayerItemBreakEvent")) {
Skript.registerEvent("Item Break", SimpleEvent.class, PlayerItemBreakEvent.class, "[player] tool break[ing]", "[player] break[ing] (a|the|) tool")
.description("Called when a player breaks his tool because its damage reached the maximum value.",
.description("Called when a player breaks their tool because its damage reached the maximum value.",
"This event cannot be cancelled.")
.examples("on tool break:")
.since("2.1.1");
}
Skript.registerEvent("Tool Change", SimpleEvent.class, PlayerItemHeldEvent.class, "[player['s]] (tool|item held|held item) chang(e|ing)")
.description("Called whenever a player changes his held item by selecting a different slot (e.g. the keys 1-9 or the mouse wheel), <i>not</i> by dropping or replacing the item in the current slot.")
.description("Called whenever a player changes their held item by selecting a different slot (e.g. the keys 1-9 or the mouse wheel), <i>not</i> by dropping or replacing the item in the current slot.")
.examples("on player's held item change:")
.since("1.0");
Skript.registerEvent("Join", SimpleEvent.class, PlayerJoinEvent.class, "[player] (login|logging in|join[ing])")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
@Description({"The player's progress in reaching the next level, this represents the experience bar in the game. " +
"Please note that this value is between 0 and 1 (e.g. 0.5 = half experience bar).",
"Changing this value can cause the player's level to change if the resulting level progess is negative or larger than 1, e.g. " +
"<code>increase the player's level progress by 0.5</code> will make the player gain a level if his progress was more than 50%."})
"<code>increase the player's level progress by 0.5</code> will make the player gain a level if their progress was more than 50%."})
@Examples({"# use the exp bar as mana",
"on rightclick with a blaze rod:",
"\tplayer's level progress is larger than 0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/expressions/ExprSpeed.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
*/
@Name("Speed")
@Description({"A player's walking or flying speed. Both can be changed, but values must be between -1 and 1 (excessive values will be changed to -1 or 1 respectively). Negative values reverse directions.",
"Please note that changing a player's speed will change his FOV just like potions do."})
"Please note that changing a player's speed will change their FOV just like potions do."})
@Examples({"set the player's walk speed to 1",
"increase the argument's fly speed by 0.1"})
@Since("<i>unknown</i> (before 2.1)")
Expand Down

0 comments on commit 389cdcb

Please sign in to comment.