Hotfix TraceEntity
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Dieser Commit ist enthalten in:
yoyosource 2024-04-21 19:42:13 +02:00
Ursprung aeb5ebfc12
Commit 07cd605d2c
2 geänderte Dateien mit 56 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -21,12 +21,15 @@ TIME=HH:mm:ss
DATE=........
COMMAND_HELP_HEAD=§7---=== (§e{0}§7) ===---
ONLY_SCHEMS=§cFolders are unselectable
PAGE_LIST=§e Page ({0}/{1}) »»
LIST_PREVIOUS_PAGE=§ePrevious page
LIST_NEXT_PAGE=§eNext page
# Permissions
NO_PERMISSION=You are not allowed to use that here
SPECTATOR=§fSpectator
# Scoreboard
SCOREBOARD_TIME=Time
SCOREBOARD_REGION=Region
@ -41,6 +44,7 @@ SCOREBOARD_LOCK_TEAM=Bau Lock§8: §eTeam
SCOREBOARD_LOCK_TEAM_AND_SERVERTEAM=Bau Lock§8: §e(Server) Team
SCOREBOARD_LOCK_SERVERTEAM=Bau Lock§8: §eServer Team
SCOREBOARD_LOCK_NOBODY=Bau Lock§8: §cNobody
# Flags
FLAG_COLOR=Color
FLAG_TNT=TNT
@ -48,6 +52,8 @@ FLAG_FIRE=Fire
FLAG_FREEZE=Freeze
FLAG_PROTECT=Protect
FLAG_ITEMS=Items
FLAG_TESTBLOCK=Testblock
FLAG_CHANGED=Changed
FLAG_FIRE_ALLOW=§con
FLAG_FIRE_DENY=§aoff
FLAG_FREEZE_ACTIVE=§aon
@ -78,10 +84,17 @@ FLAG_COLOR_BROWN=§eBrown
FLAG_COLOR_GREEN=§2Green
FLAG_COLOR_RED=§cRed
FLAG_COLOR_BLACK=§0Black
FLAG_TESTBLOCK_NO_VALUE=§eNo Value
FLAG_TESTBLOCK_NORTH=§eNorth
FLAG_TESTBLOCK_SOUTH=§eSouth
FLAG_CHANGED_NO_CHANGE=§cNo
FLAG_CHANGED_HAS_CHANGE=§aYes
# Region
REGION_TYPE_NORMAL=Normal
REGION_TYPE_BUILD=Build area
REGION_TYPE_ONLY_TB=Dummy
# AttributesCopy
ATTRIBUTES_CANT_COPY=§cYou need to hold the same item type and hover over the same block to copy.
ATTRIBUTES_NO_COPY=§cNo attributes to copy.
@ -90,6 +103,7 @@ ATTRIBUTE_REMOVE_COMMAND_HELP=§8/§eattributeremove §8[§eattribute§8|§7all
ATTRIBUTE_REMOVE_ALL=§eAll attributes removed.
ATTRIBUTE_REMOVE_SINGLE=§eAttribute §7{0}§e removed.
ATTRIBUTE_REMOVE_NOT_FOUND=§cAttribute not found
# AutoStart
AUTOSTART_COMMAND_HELP=§8/§etimer §8- §7Retrieve AutostartTimer Tool
AUTOSTART_ITEM_NAME=§eAutostartTimer
@ -100,6 +114,7 @@ AUTOSTART_MESSAGE_START=§eAutostartTimer started
AUTOSTART_MESSAGE_RESULT1=§eTime §7until §eexplosion §7at enemy§8:§e {0}§7 game ticks
AUTOSTART_MESSAGE_RESULT2=§7Time difference in §egame-ticks §7until {0} seconds§8:§e {1}
AUTOSTART_MESSAGE_RESULT3=§7positive, if too few, negative if too many
# Backup
BACKUP_HELP_CREATE=§8/§ebackup create §8- §7Create a region backup
BACKUP_HELP_LOAD=§8/§ebackup load §8[§7BackupName§8] §8- §7Load a region backup
@ -116,6 +131,7 @@ BACKUP_LOAD=§7Backup loaded
BACKUP_INV_NAME=§eBackup
BACKUP_ITEM_NAME=§eBackup §7from §e{0}
BACKUP_LORE=§eClick to load
# Bau
BAU_COMMAND_HELP_INFO=§8/§ebau info §8- §7Alias for §8/§ebauinfo
BAU_INFO_ITEM_NAME=§eBau-Management
@ -128,9 +144,10 @@ BAU_INFO_ITEM_LORE_PROTECT=§7Protect§8: §e{0}
BAU_INFO_ITEM_LORE_ITEMS=§7Items§8: §e{0}
BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Information regarding this build server
BAU_INFO_COMMAND_OWNER=§7Owner§8: §e{0}
BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
BAU_INFO_COMMAND_MEMBER=§7Member §8[§7{0}§8]§8: §e
BAU_INFO_COMMAND_FLAG=§7{0}§8: §7{1}
BAU_INFO_COMMAND_TPS=§7TPS§8:§e
# Countingwand
COUNTINGWAND_COMMAND_HELP=§8/§ecountingwand §8- §7Receive a CountingWand
COUNTINGWAND_ITEM_NAME=§eMeterstick
@ -140,11 +157,13 @@ COUNTINGWAND_MESSAGE_RCLICK=§7First position at: §8[§7{0}§8, §7{1}§8, §7{
COUNTINGWAND_MESSAGE_LCLICK=§7Second position at: §8[§7{0}§8, §7{1}§8, §7{2}§8] ({3}§8) ({4}§8)
COUNTINGWAND_MESSAGE_VOLUME=§e{0}
COUNTINGWAND_MESSAGE_DIMENSION=§e{0}§8, §e{1}§8, §e{2}
# Design Endstone
DESIGN_ENDSTONE_COMMAND_HELP=§8/§edesignendstone §8- §7Highlight endstone in design
DESIGN_ENDSTONE_REGION_ERROR=§cThis region has no build area
DESIGN_ENDSTONE_ENABLE=§aEndstone is highlighted
DESIGN_ENDSTONE_DISABLE=§cEndstone is no longer hightlighted
# Detonator
DETONATOR_LOC_REMOVE=§e{0} removed
DETONATOR_LOC_ADD=§e{0} added
@ -194,16 +213,19 @@ GUI_EDITOR_ITEM_TRASH_LORE=§7Drop item here
GUI_EDITOR_ITEM_MORE=§eMore items
GUI_EDITOR_ITEM_CLOSE=§eClose
GUI_EDITOR_TITLE_MORE=Select item
# Script
## Errors
SCRIPT_ERROR_GUI=§cError in parsing script: Line {0}
SCRIPT_ERROR_GLOBAL=§cError in global script: Line {0}
SCRIPT_ERROR_CLICK=§cError in script: Line {0}
SCRIPT_ERROR_ONLY_IN_GLOBAL=§cThis function is only available in global scripts
## CustomScript
SCRIPT_HOTKEY_ITEM_NAME=§7Hotkey§8: §e{0}
SCRIPT_EVENT_ITEM_NAME=§7Event§8: §e{0}
SCRIPT_COMMAND_ITEM_NAME=§7Command§8: §e/{0}
## Script Menu GUI
SCRIPT_MENU_GUI_ITEM_LORE_1=§7Click to retrieve
SCRIPT_MENU_GUI_ITEM_LORE_2=§7Shift-Click to copy
@ -214,6 +236,7 @@ SCRIPT_MENU_GUI_ITEM_ADD_NAME=§eInsert
SCRIPT_MENU_GUI_ITEM_ADD_LORE=§7Click with a book to insert
SCRIPT_MENU_GUI_ENTER_NAME=§eEnter a name
SCRIPT_DEPRECATED=§cThe function §8\'§e{0}§8\'§c is deprecated and will be removed in the future. Please use §8\'§e{1}§8\'§c instead.
# Shield Printing
SHIELD_PRINTING_HELP_START=§8/§eshieldprinting start §8- §7Starts the shield printing
SHIELD_PRINTING_HELP_COPY=§8/§eshieldprinting copy §8- §7Copies the shield configuration
@ -251,8 +274,10 @@ SHIELD_PRINTING_START=§aThe shield printing has been started.
SHIELD_PRINTING_COPY=§aThe shield has been copied.
SHIELD_PRINTING_APPLY=§aThe shield has been applied.
SHIELD_PRINTING_STOP=§aThe shield printing has been stopped.
# Unsign Book
UNSIGN_HELP=§8/§eunsign §8- §7Make a signed book writable again
# Simulator
SIMULATOR_HELP=§8/§esimulator §8-§7 Gives you the simulator wand
SIMULATOR_CREATE_HELP=§8/§esimulator create §8[§7name§8] §8-§7 Create a new simulator
@ -283,6 +308,7 @@ SIMULATOR_WAND_LORE_3=§eLeft click §8- §7Start the simulation
SIMULATOR_WAND_LORE_4=§eRight click in air §8- §7Opens the gui
SIMULATOR_WAND_LORE_5=§eDouble Sneak §8- §7Swap between TNT and Redstone Block
SIMULATOR_REGION_FROZEN=§cSimulator cannot be used inside frozen regions
## Other
SIMULATOR_PLUS_ONE=§7+1
SIMULATOR_PLUS_PIXEL_SHIFT=§eShift §7Click for §e+0,0625
@ -296,6 +322,7 @@ SIMULATOR_POSITION_Z=§7z-Position
SIMULATOR_BACK=§eBack
SIMULATOR_GUI_TOTAL_TNT=§7Total TNT§8: §e{0}
SIMULATOR_DELETED=§cSimulator deleted
## GUI
SIMULATOR_POSITION_EDIT=§eEdit position
SIMULATOR_POSITION_ADD=§eSet position
@ -366,16 +393,19 @@ SIMULATOR_TNT_SPAWN_ADD_IGNITION_PHASE=§eAdd prime phase
SIMULATOR_TNT_SPAWN_ADD_TNT=§eAdd TNT
SIMULATOR_TNT_SPAWN_REMOVE_TNT=§cRemove
SIMULATOR_TNT_SPAWN_POSITION_ANVIL_GUI_NAME=Position
# SmartPlace
SMART_PLACE_HELP=§8/§esmartplace §8-§7 Toggles SmartPlace
SMART_PLACE_INFO=§7Places rotatable blocks §eaway§7 from you when §esneaking§7.
SMART_PLACE_ENABLE=§aSmartPlace activated
SMART_PLACE_DISABLE=§cSmartPlace deactivated
# InventoryFiller
INVENTORY_FILL_HELP=§8/§einventoryfill §8- §7Toggles InventoryFill
INVENTORY_FILL_INFO=§7Helps you fill containers by looking at them while sneaking and dropping the item. Or just scroll on a container to change the amount of the item inside.
INVENTORY_FILL_ENABLE=§aInventoryFiller activated
INVENTORY_FILL_DISABLE=§cInventoryFiller deactivated
# Killchecker
KILLCHECKER_HELP_ENABLE=§8/§ekillchecker enable §8- §7Enables Killchecker / Recalculates kills
KILLCHECKER_HELP_DISABLE=§8/§ekillchecker disable §8- §7Disables Killchecker
@ -384,6 +414,7 @@ KILLCHECKER_INFO2=§7Only colorable blocks like Wool, Terractotta, Stained Glass
KILLCHECKER_ENABLE=§aKillchecker activated
KILLCHECKER_DISABLE=§cKillchecker deactivated
KILLCHECKER_BOSSBAR=§e§l{0} §7(§e{1}%§7) §e§l{2}§7 cannons
# BlockCounter
BLOCK_COUNTER_HELP_TOGGLE=§8/§eblockcounter §8- §7Toggle on/off
BLOCK_COUNTER_HELP_ENABLE=§8/§eblockcounter enable §8- §7Toggles BlockCounter on
@ -392,11 +423,13 @@ BLOCK_COUNTER_MESSAGE=§7Damage §8> §e{0} §7Blocks §e{1} §7TNT §e{2} §7
BLOCK_COUNTER_MESSAGE_SECOND=§7Damage §8> §e{0} §7Blocks §e{1} §7TNT §e{2} §7Blocks/TNT §e{3} §7Blocks/s
BLOCK_COUNTER_ENABLE=§7BlockCounter activated
BLOCK_COUNTER_DISABLE=§7BlockCounter deactivated
# DepthCounter
DEPTH_COUNTER_MESSAGE=§7Depth §8> §7
DEPTH_COUNTER_COUNT={0}{1}§8×{2}{3}§8×{4}{5}
DEPTH_COUNTER_HOVER=§7X§8ק7Y§8ק7Z
DEPTH_COUNTER_TNT=§7 TNT§8: §e{0}
# TPSLimit
TPSLIMIT_FREEZE_HELP=§8/§etpslimit 0 §8-§7 Freeze TPS
TPSLIMIT_LIMIT_HELP=§8/§etpslimit §8[§720>x>0.5§8] §8-§7 Slow TPS down
@ -419,6 +452,7 @@ TPSLIMIT_ANVIL_GUI=New TPS limit
TPSLIMIT_CURRENT=§7Current TPS limit§8: §e{0}
TPSLIMIT_SET=§eSet TPS limit to {0}
TPSLIMIT_FROZEN=§eTPS frozen
# Trace
TRACE_RECORD=§aon
TRACE_HAS_TRACES=§ehas Traces
@ -442,6 +476,7 @@ TRACE_MESSAGE_SHARE_HOVER=§eClick to view
TRACE_MESSAGE_FOLLOW=§aYou are now following {0} Trace show state
TRACE_MESSAGE_FOLLOW_SELF=§cYou cannot follow yourself!
TRACE_MESSAGE_UNFOLLOW=§cYou are no longer following a Trace show state
TRACE_COMMAND_HELP_START=§8/§etrace start §8- §7Starts recording of all TNT-positions
TRACE_COMMAND_HELP_STOP=§8/§etrace stop §8- §7Stops the TNT-Tracer
TRACE_COMMAND_HELP_AUTO=§8/§etrace toggleauto §8- §7Automatic start of recording
@ -467,12 +502,14 @@ TRACE_GUI_TRACE_ACTIVE_AUTO=§eAuto-Trace is active
TRACE_GUI_AUTO_TRACE_INACTIVE=§eacitvate Auto-Tracer
TRACE_GUI_AUTO_TRACE_ACTIVE=§edeactivate Auto-Tracer
TRACE_GUI_DELETE=§eDelete trace
# Loader
LOADER_SETUP=§eSetup
LOADER_RUNNING=§aRunning
LOADER_PAUSE=§7Pause
LOADER_END=§8Finished
LOADER_SINGLE=§aSingle
LOADER_MESSAGE_INTERACT=§e{0} added {1}
LOADER_MESSAGE_UNINTERACT=§eRemoved Element
LOADER_BUTTON_TNT=TNT
@ -490,6 +527,7 @@ LOADER_BUTTON_LECTERN=Lectern
LOADER_BUTTON_TRAPDOOR=Trapdoor
LOADER_BUTTON_DOOR=Door
LOADER_BUTTON_FENCEGATE=Fencegate
LOADER_HELP_SETUP=§8/§eloader setup §8- §7Starts recording actions
LOADER_SETUP_STOP_FIRST=§cPlease stop the current loader first!
LOADER_HELP_START=§8/§eloader start §8- §7Playback of previously recorded actions
@ -525,6 +563,7 @@ LOADER_GUI_SETTINGS_COPY=§7Copy
LOADER_GUI_SETTINGS_DELETE=§cDelete
LOADER_GUI_WAIT_TITLE=Settings
LOADER_GUI_WAIT_BACK=§8Back
LOADER_GUI_CLICK_TO_EDIT=§7Click to edit
LOADER_GUI_ITEM_NAME=§7{0}§8: §e{1}
LOADER_SETTING_NAME=§7{0}
@ -559,6 +598,7 @@ LOADER_INTERACTION_OPEN=Open
LOADER_INTERACTION_CLOSED=Closed
LOADER_INTERACTION_COMPARE=Compare
LOADER_INTERACTION_SUBTRACT=Subtract
# Loadtimer
LOADTIMER_HELP_OVERVIEW=§7Compete with your friends loading your cannon and get information about the cannon
LOADTIMER_HELP_START_1=§8/§eloadtimer start §8-§7 Starts the simple Loadtimer
@ -588,6 +628,7 @@ LOADTIMER_SUMARY_TIMES_LAST=§7\\/
LOADTIMER_SUMARY_STATS_HEAD=§7Cannon-Stats§8:
LOADTIMER_SUMARY_STATS_TNT=§7TNT: §e{0}
LOADTIMER_SUMARY_STATS_FREQ=§7Loading frequency: §e{0}/m§8, §7Shot frequency: §e{1}/m
# Observer
OBSERVER_HELP=§7Right-Click an Observer to get the Trace. Flame particles have to be enabled. The Particles will be shown in the block.
OBSERVER_HELP_ENABLE=§8/§eobserver enable §8-§7 Activates the Observer-Tracer
@ -599,6 +640,7 @@ OBSERVER_DISABLE=§7Observer trace stopped
OBSERVER_DELETE=§7Observer trace deleted
OBSERVER_RETRACE_DONE=§7Observer trace retraced
OBSERVER_RETRACE_NO_TRACE=§7No Observer trace to retrace
# Other
OTHER_ITEMS_TELEPORT_NAME=§eTeleporter
OTHER_ITEMS_TELEPORT_GUI_NAME=Teleport
@ -666,6 +708,7 @@ NIGHT_VISION_OFF=§eNightvision deactivated
NIGHT_VISION_ON=§eNightvision activated
NIGHT_VISION_ITEM_ON=§7Nightvision: §eActivated
NIGHT_VISION_ITEM_OFF=§7Nightvision: §eDeactivated
#Navigation Wand
NAVIGATION_WAND=§eNavigation Wand
NAVIGATION_WAND_LEFT_CLICK=§eLeft click: jump to location
@ -811,6 +854,7 @@ PANZERN_PREPARE4=§74. Standing in the region that is being armored can improve
PANZERN_NO_WORLDEDIT=§cYou have no WorldEdit selcetion
PANZERN_PROGRESS=§e{0} §7Blocks left, §e{1} §7Blocks per second, §e{2} §7block delta
PANZERN_DONE=§aDone
# Laufbau
LAUFBAU_HELP=§8/§elaufbau §8[§7smallest§8|§7blastresistant§8] §8- §7Build a barrel in your WorldEdit selection using the traces
LAUFBAU_HELP_SETTINGS=§8/§elaufbau settings §8- §7Opens the settings GUI
@ -909,6 +953,7 @@ LAUFBAU_SHAPE_OUTER_LEFT=§8-§7 Shape outer links
LAUFBAU_SHAPE_INNER_LEFT=§8-§7 Shape inner left
LAUFBAU_TILT_NONE=§8-§7 Tilt none
LAUFBAU_TILT_PARTIAL=§8-§7 Tilt partial
# UTILS
SELECT_HELP=§8/§eselect §8[§7RegionsTyp§8] §8- §7Select a region type
SELECT_EXTENSION_HELP=§8/§eselect §8[§7RegionsTyp§8] §8[§7Extension§8] §8- §7Select a region type with or without extension
@ -956,6 +1001,7 @@ PISTON_HELP_1=§7Right click on piston with a slime ball to calculate the moved
PISTON_HELP_2=§7Count is red, if one unmoveable block is present.
PISTON_HELP_3=§7Count is yellow, if too many blocks are present.
PISTON_INFO=§7Moved Blocks {0}{1}§8/§712
# Warp
WARP_LOC_X=§7X§8: §e{0}
WARP_LOC_Y=§7Y§8: §e{0}
@ -971,7 +1017,7 @@ WARP_GUI_NAME=Warps
WARP_GUI_NO=§cNo warps exist
WARP_GUI_DISTANCE=§7Distance: §e{0} §7blocks
WARP_GUI_LCLICK=§7Left click to teleport
WARP_GUI_RCLICK=§7Rickt click to edit
WARP_GUI_RCLICK=§7Right click to edit
WARP_INFO_NAME=§7Name: §e{0}
WARP_HELP_ADD=§8/§ewarp add §8[§7name§8] §8- §7Create a new warp
WARP_HELP_TELEPORT=§8/§ewarp §8[§7name§8] §8- §7Teleport to a warp
@ -983,18 +1029,23 @@ WARP_HELP_LIST=§8/§ewarp list §8- §7List all warps
STOP_HELP=§8/§estop §8- §7Stops the server
STOP_MESSAGE=§eServer is stopping
KICKALL_HELP=§8/§ekickall §8- §7Kick all players from the server except the owner
# Techhider
TECHHIDER_HELP=§8/§etechhider §8- §7Toggle Techhider
TECHHIDER_GLOBAL=§cNo techhider in global region
TECHHIDER_ON=§aTechhider activated
TECHHIDER_OFF=§cTechhider deactivated
# XRAY
XRAY_HELP=§8/§exray §8- §7Toggle Xray
XRAY_GLOBAL=§cNo xray in global region
XRAY_ON=§aXray activated
XRAY_OFF=§cXray deactivated
# WorldEdit
COLORREPLACE_HELP=§8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §7Replace all blocks of one color with another
TYPEREPLACE_HELP=§8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Replace all blocks of one type with another
TYPEREPLACE_HELP=§8//§etypereplace §8[§7type§8] §8[§7type§8] §8- §7Replace all blocks of one type with another
# Schematic
SCHEMATIC_GUI_ITEM=§eSchematics

Datei anzeigen

@ -60,11 +60,11 @@ public class TraceEntity extends REntity {
public TraceEntity(REntityServer server, Location location, boolean isExplosion, List<TNTPoint> records, Trace trace) {
super(server, EntityType.FALLING_BLOCK, location, BlockIds.impl.materialToId(isExplosion ? Material.RED_STAINED_GLASS : Material.TNT) >> (Core.getVersion() <= 12 ? 4 : 0));
setNoGravity(true);
this.records = records;
uniqueTntIdsString = records.stream().map(TNTPoint::getTntId).distinct().map(Object::toString).collect(Collectors.joining(" "));
this.trace = trace;
uniqueTntIdsString = records.stream().map(TNTPoint::getTntId).distinct().map(Object::toString).collect(Collectors.joining(" "));
addEntityMethod.invoke(server, this);
setNoGravity(true);
}
/**