Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-10-16 08:58:28 -03:00
commit b99b2bd57e
2 files changed
+2 -1

No files matched your search

@@ -2949,6 +2949,7 @@ public class Expression implements Cloneable
{ {
this.expression = expression.trim(). this.expression = expression.trim().
replaceAll("\\r\\n?", "\n"). replaceAll("\\r\\n?", "\n").
replaceAll("\\t"," ").
replaceAll(";+$", ""); replaceAll(";+$", "");
VariablesAndConstants(); VariablesAndConstants();
UserDefinedFunctionsAndControlFlow(); UserDefinedFunctionsAndControlFlow();
@@ -32,7 +32,7 @@ __on_player_uses_item(player, item_tuple, hand) ->
__on_player_clicks_block(player, block, face) -> __on_player_clicks_block(player, block, face) ->
( (
print(''); print('');
print('player clicks an item:'); print('player clicks a block:');
print(' - player: '+player); print(' - player: '+player);
print(' - block: '+block+' at '+map(pos(block), str('%.2f',_))); print(' - block: '+block+' at '+map(pos(block), str('%.2f',_)));
print(' - face: '+face) print(' - face: '+face)