SteamWar/BauSystem
Archiviert
13
0
Commit graph

695 Commits

Autor SHA1 Nachricht Datum
jojo
93003de08d Make ScriptListener.ScriptExecutor.player final
Make ScriptListener.ScriptExecutor.commands final
Fixing commands without spaces
Fixing negative and zero sleepTime
Add Error message on sleep without number
Remove throw-away-references
2020-12-16 09:26:17 +01:00
jojo
15570cab7c Make Sleep 'CaSeInDePeNdEnCe'
Make Sleep Command like Bukkit Command (String.split(" "))
2020-12-16 09:08:27 +01:00
jojo
5b73ec5305 Fix ignored Sleep Time 2020-12-16 09:04:31 +01:00
jojo
00a77b378b Merge ScriptListener.Script and ScriptListener.ScriptExecutor 2020-12-16 09:04:18 +01:00
jojo
ee94b51612 Add basic sleep command to ScriptSystem 2020-12-15 20:33:40 +01:00
7f67333ea4 Merge branch 'master' into bauconfigRefactoring
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
#	BauSystem_Main/src/de/steamwar/bausystem/world/RegionListener.java
2020-12-12 17:15:45 +01:00
9126e6b303 Removing changes from player history 2020-12-12 17:13:43 +01:00
879585e542 Merge pull request 'Remove superflous chained command' (#138) from removeChained into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-12-12 16:44:59 +01:00
jojo
571e5a22ec Merge branch 'master' into ScriptComments
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/world/ScriptListener.java
2020-12-12 16:35:26 +01:00
c6e8cad799 Fix WE Security issue 2020-12-11 15:31:54 +01:00
e901568a07 Hotfix WE security issue 2020-12-11 15:19:15 +01:00
0f03e2b0a9 Hotfix WE security issue 2020-12-11 14:55:09 +01:00
2f123d9a97 Refactoring sections.yml, Adding Region.paste to player history 2020-12-11 14:33:00 +01:00
7f14182b8e Remove superflous chained command 2020-12-11 13:00:36 +01:00
4b1a03e5fb Fix script book in 1.12 2020-12-11 12:47:32 +01:00
YoyoSource
6dcda0f509 Add Comments to scripts 2020-12-10 21:30:31 +01:00
YoyoSource
75c7c8560c Add ScriptListener as its own class 2020-12-10 20:16:07 +01:00
52c198a802 Add script item 2020-12-10 18:49:21 +01:00
jojo
bb92dc51db Add basic Trace System 2020-12-05 21:33:48 +01:00
jojo
daad65b1d7 Add RecordManager 2020-12-04 22:49:21 +01:00
Chaoscaot
d600297d4d Change Language 2020-11-27 15:38:10 +01:00
Chaoscaot
7a778c0484 Fixing Loader to 0 2020-11-27 15:36:38 +01:00
jojo
d7e13f2be2 Add ExplodeListener 2020-11-20 15:26:11 +01:00
jojo
dc79b80cc0 Initial TNT-Tracer 2020-11-19 13:00:12 +01:00
jojo
fce4a64625 Add //u -> //undo
Add //r -> //redo
2020-11-18 19:51:53 +01:00
jojo
16901df176 Simplify World Edit Shortcuts 2020-11-18 18:36:02 +01:00
jojo
c9d2a7fddc Fix TabCompleteException 2020-11-17 16:35:32 +01:00
jojo
670be6d968 Remove unused Imports 2020-11-17 09:39:03 +01:00
jojo
8d8ba668c9 Add WorldEdit Shortcuts 2020-11-16 19:41:37 +01:00
jojo
259549ca90 Add WorldEdit Shortcuts 2020-11-16 18:35:39 +01:00
e416bf1414 Merge pull request 'Add /tpslimit Command' (#113) from TPSLimiter into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-11-16 14:32:46 +01:00
jojo
ea6505e3c7 Seperate Version dependant code 2020-11-16 14:24:55 +01:00
jojo
87285ee802 Add Permission Check 2020-11-16 14:04:08 +01:00
jojo
b2efaa55f6 Add Permission Check 2020-11-16 14:02:05 +01:00
jojo
9b803facd5 Fix CommandTPSLimiter 2020-11-16 13:59:01 +01:00
jojo
9a082dbdba Fix CommandTPSLimiter 2020-11-16 13:39:29 +01:00
jojo
36d6c6bedb Fix CommandTPSLimiter 2020-11-16 07:28:49 +01:00
jojo
ab170426cb Fix CommandTPSLimiter 2020-11-15 21:54:06 +01:00
jojo
9388e1abd5 Add velocity 2020-11-15 19:35:32 +01:00
jojo
e9facf92ca Add velocity (commented) 2020-11-15 15:55:34 +01:00
jojo
d23875cc3a Add Permission Check in CommandTPSLimiter 2020-11-15 14:10:11 +01:00
jojo
179632cd21 Fix BauScoreboard 2020-11-15 13:54:00 +01:00
jojo
50c18084b4 Fix BauScoreboard
Fix TPSLimiter
2020-11-15 13:42:19 +01:00
jojo
eeef18d504 Add /tpslimit Command 2020-11-15 13:12:52 +01:00
df44910ff5 Merge pull request 'Fix ConcurrentModificationException' (#112) from FixTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-11-15 12:05:11 +01:00
jojo
7a978a2f5b Fix ConcurrentModificationException 2020-11-15 11:53:10 +01:00
jojo
585c4e6960 Fix Tracer Warning 2020-11-13 17:16:10 +01:00
c3b59015fd Remove built in tps sensoring 2020-11-07 11:57:23 +01:00
90b3c7669b Improve Scoreboard (And tps rendering) 2020-11-07 11:53:15 +01:00
Chaoscaot
897a18d8b3 Fixing Yoyo Code 2020-10-28 21:42:43 +01:00
641a7bb6ec Hotfix WE problem 2020-10-27 15:27:29 +01:00
jojo
6eb8d51dbd Fix Autoloader load at Lever
Fix Autoloader load at Noteblock
2020-10-24 17:31:52 +02:00
jojo
37caed14a3 Fix Autoloader load at Observer 2020-10-24 15:26:49 +02:00
jojo
d9079a5010 Fix TraceManager.currentFrameSize 2020-10-02 18:06:36 +02:00
850d891bf6 Merge pull request 'Fixed CME' (#103) from detonator-fix into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-09-30 08:01:59 +02:00
Chaoscaot
156ee1c7b1 Fixed CME 2020-09-29 22:01:54 +02:00
d6fa5cf5e7 Merge pull request 'Fix UnsupportedOperationException on addAll()' (#102) from FixTracer into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-09-26 09:28:34 +02:00
jojo
2cc621f188 Fix UnsupportedOperationException on addAll() 2020-09-25 21:29:29 +02:00
e5d3712287 Merge pull request 'Fixed CCE When Block is Changed' (#101) from detonator2.0 into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-09-25 16:25:02 +02:00
Chaoscaot
9d02ce7862 Simplified Remove 2020-09-25 13:31:51 +02:00
Chaoscaot
19cf553654 Fixed CCE When Block is Changed 2020-09-24 22:40:32 +02:00
Chaoscaot
dbaba2fbcc Fixed CCE When Block is Changed 2020-09-24 22:38:27 +02:00
d497ecf832 Lazyly load owner to improve startup time 2020-09-22 17:40:43 +02:00
Chaoscaot
4fd2638040 Fixed Lever Activation for 0 Ticks 2020-09-15 20:14:41 +02:00
Chaoscaot
0761b9105e Fixed Detonator CCE 2020-09-14 14:06:06 +02:00
Chaoscaot
83c942764c Fixed Autloader 2020-09-13 19:57:48 +02:00
Chaoscaot
c464cd9df0 Removed Unused Imports 2020-09-11 21:35:05 +02:00
Chaoscaot
6f8c3961a2 Finishing... 2020-09-11 21:32:32 +02:00
Chaoscaot
c27a548866 Added Function on Tripwire for 1.12 2020-09-09 22:45:28 +02:00
Chaoscaot
5ccf3ddf3c Removed Unused Stuff 2020-09-07 21:35:08 +02:00
Chaoscaot
24131e5bbe Reworked Detonator 2020-09-07 19:18:14 +02:00
f5c34db39e Refactor for "better" error handling 2020-09-06 21:05:39 +02:00
607ff10250 Move Copy-Schematic to BauSystem due to arena implications 2020-09-06 21:04:07 +02:00
Chaoscaot
55e5b65345 Improved Language 2020-09-06 14:27:29 +02:00
Chaoscaot
ba2d321109 Added 12.2 Support 2020-09-06 14:01:30 +02:00
Chaoscaot
5952258956 Initial Detonator Commit 2020-09-06 01:52:19 +02:00
1f967fe998 Merge pull request 'Fix null pointer exception' (#92) from simplify-tracer into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-09-05 12:10:48 +02:00
jojo
63d787b2e4 Fix null pointer exception 2020-09-05 11:45:40 +02:00
jojo
1fba4511fa Fix null pointer exception 2020-09-05 10:50:08 +02:00
aa318d7d94 Adding AGPL header to tracer 2020-09-03 20:10:01 +02:00
2514b54e02 Merge branch 'prepare_open_source'
# Conflicts:
#	BauSystem_15/src/de/steamwar/bausystem/tracer/PlayerTraceCache_15.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/TracerUpdateManager.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/debugcallback/DebugCallbackActionBar.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/guicallback/GuiCallbackRecording.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/guicallback/GuiCallbackTNTFrame.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/guicallback/GuiCallbackTNTTrace.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/showcallback/TNTCallbackCacheUpdate.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/showcallback/TNTCallbackShow.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/updatecallback/TracerCallbackPositions.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/updatecallback/TracerCallbackTracing.java
#	BauSystem_API/src/de/steamwar/bausystem/tracer/updatecallback/TracerCallbackUpdatePoints.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTListener.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTTracer12.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTTracer15.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/ShowManager.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/ShowStatus.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/TNTFrame.java
#	BauSystem_Main/src/de/steamwar/bausystem/tracer/trace/TNTTrace.java
2020-09-03 20:07:39 +02:00
b800c3f197 Merge pull request 'Simplify Tracer' (#91) from simplify-tracer into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-08-30 13:20:39 +02:00
5e539a8756 Untangle spagetti code #3 (might not work in this state) 2020-08-30 12:01:47 +02:00
jojo
4aaf9d0c3e Fix CommandTrace 2020-08-30 10:51:42 +02:00
dda4ad7f99 Untangle spagetti code #2 2020-08-30 08:01:51 +02:00
6831ada70f Untangle spagetti code part 1 2020-08-30 07:45:32 +02:00
1f2b6a0290 Simplify Tracer #1 2020-08-30 07:13:11 +02:00
jojo
a581beee5c Fix Tracer dirty Optimization 2020-08-30 03:10:45 +02:00
jojo
0b13700a3a Fix Tracer maxSize Optimization 2020-08-30 03:06:22 +02:00
jojo
daa6979e5a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
2020-08-30 02:47:01 +02:00
jojo
e62f371578 Merge branch 'TNTTracer' 2020-08-30 02:44:52 +02:00
jojo
b13dcc57a1 Update Tracer 2020-08-30 02:23:23 +02:00
143735809c Prepare open source release 2020-08-26 18:48:57 +02:00
e18b2c77d8 Remove unnecessary error message 2020-08-15 17:16:41 +02:00
81182f5b6f Fix 1.12 reduced debug info 2020-07-27 06:53:08 +02:00
6b682e666e Fix ReducedDebugInfo 2020-07-26 23:00:03 +02:00
2858f87e5d Fix DebugInfo 2020-07-26 22:57:07 +02:00
72a2b4821d Fix ReducedDebugInfo 2020-07-26 22:55:39 +02:00
9d56f09624 Fix ReducedDebugInfo false 2020-07-26 22:52:48 +02:00
jojo
8aee883a8e Remove Logger 2020-07-26 16:29:16 +02:00
24f8e22fb4 Merge pull request 'Fix Trace show/hide Bug' (#86) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-25 21:57:06 +02:00
jojo
03683fc0b6 Rename hide() -> hideBlockTraces() 2020-07-25 21:55:23 +02:00
jojo
e0b885ad32 Fix Trace show/hide Bug 2020-07-25 21:44:41 +02:00
1465d2540d Merge pull request 'Fix Trace show/hide Bug' (#85) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-25 21:38:53 +02:00
jojo
c1ec555838 Fix Trace show/hide Bug 2020-07-25 21:36:42 +02:00
06b6978442 Merge pull request 'TNTTracer' (#84) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-25 21:30:20 +02:00
jojo
bb8c6c259e Fix Trace show/hide Bug 2020-07-25 21:16:58 +02:00
8d44e714c7 Merge pull request 'Initial Commit 1.12 Support' (#80) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-20 05:48:58 +02:00
jojo
6c625c51c0 Add dirtyFlag after explode 2020-07-19 20:42:10 +02:00
jojo
4eed29d7d6 Add Initial 1.12 Support 2020-07-19 20:36:33 +02:00
8e1029b860 Merge pull request 'Fix Updating Issue while Tracing' (#79) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 19:56:06 +02:00
jojo
930e8dc7d0 Fix Updating Issue while Tracing 2020-07-19 19:54:58 +02:00
6f3523b1de Merge pull request 'Fix ConcurrentModificationException - 3' (#78) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 19:19:43 +02:00
jojo
8254fb6e5e Fix ConcurrentModificationException - 3 2020-07-19 19:18:28 +02:00
7da1f7acbb Merge pull request 'Fix ConcurrentModificationException - 2' (#77) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 17:51:50 +02:00
jojo
f4378c58c2 Fix ConcurrentModificationException - 2 2020-07-19 17:49:07 +02:00
20ee35ae10 Merge pull request 'Fix ConcurrentModificationException' (#76) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 17:29:19 +02:00
jojo
8d10a702b4 Fix ConcurrentModificationException 2020-07-19 17:21:33 +02:00
fe916438b1 Merge pull request 'Fix ArrayIndexOutOfBoundsException' (#75) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 16:40:23 +02:00
jojo
29c3e954be Fix ArrayIndexOutOfBoundsException 2020-07-19 16:38:47 +02:00
32fbe9ddf3 Merge pull request 'TNTTracer' (#74) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 15:27:33 +02:00
jojo
6f558b6b91 Fix dirty Flaging 2020-07-19 14:54:07 +02:00
jojo
7e5d690c9d Fix synchronization Deadlock 2020-07-19 14:51:40 +02:00
jojo
df72a08f99 Fix NullPointerException in delete() 2020-07-19 14:42:55 +02:00
jojo
d800eb5544 Fix help message 15 2020-07-19 10:14:14 +02:00
7a59ca90b4 Merge pull request 'TNTTracer' (#70) from TNTTracer into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-07-19 08:21:29 +02:00
jojo
29cb90f128 Fix "/trace delete [TRACE-ID]" 2020-07-19 07:39:17 +02:00
jojo
fac6d6986e Fix Spam 2020-07-19 07:33:57 +02:00
jojo
a4cc32d808 Add clickable TNT list 2020-07-19 07:31:04 +02:00
jojo
fa6a5abf67 Add permissionCheck
Remove "/trace gui"
2020-07-19 01:06:29 +02:00
jojo
3a44e2db2a Add Message 2020-07-18 23:20:06 +02:00
jojo
619498a898 Add Trace 1.15 Support and Rework 2020-07-18 23:01:50 +02:00
19adf2eedb Implementing custom testblock & reset region capability 2020-07-11 11:08:43 +02:00
83ab53aa91 Merge remote-tracking branch 'origin/GillsCommand'
# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
2020-07-11 07:35:47 +02:00
jojo
90357e4fd2 Add TNTTracerGUI start 2020-07-08 13:05:41 +02:00
jojo
44a6156dec Automatischer TNT Tracer Messages 2020-07-08 10:06:59 +02:00
jojo
0cf208af2e Add TNTTracer 15 2020-07-07 21:21:00 +02:00
b8a2739512 Implement debug stick command 2020-07-04 09:29:04 +02:00
Jan9103
68e44aa670 YML überabreitet und Befehl umbenannt 2020-06-30 07:34:19 +02:00
Jan9103
3207cd844b TntCommand Rework 2020-06-29 07:50:25 +02:00
Jan9103
0dfed9f18a TntCommand Rework 2020-06-29 07:47:32 +02:00
Jan9103
05d2ef4632 added Command "/gills" & registered it
this is a slightly modified version of "/nv"
2020-06-25 11:57:16 +02:00
bce1f156ca Remove autofreezer 2020-06-22 20:12:04 +02:00
8bd88b5674 Fix TPS bar to 1 decimal 2020-06-21 21:55:48 +02:00
jojo
ceca0f5c90 Add "survival" option in "/gm" command 2020-05-31 18:30:22 +02:00
96ee63d2f4 Hotfix AutoFreeze with FAWE 2020-04-11 13:18:28 +02:00
4ebe1f40f2 Hotfix not existing exception (ugly) 2020-04-08 17:06:01 +02:00
0889b1313b Merge branch 'itemblock' of SteamWar/BauSystem into master 2020-04-07 07:33:57 +02:00
Jan9103
193c50f99c wieder eine Log-Meldung hinzugefügt 2020-04-05 15:13:40 +02:00
Jan9103
c90695e69c angefragte Veränderungen 2020-03-26 13:42:35 +01:00
14822378ce Merge branch 'autoLoader15' of SteamWar/BauSystem into master 2020-03-23 15:10:21 +01:00
4c8c968063 Expanding the autofreeze time 2020-03-22 11:46:42 +01:00
032c0894de Send message on failing reset (Java heap space) 2020-03-22 07:44:09 +01:00
2ebaeca46b first implimentation 2020-03-21 20:01:00 +01:00
7beb95e705 Implementing AutoLoader 1.15 2020-03-15 17:11:36 +01:00
64fdf9bf16 Fixing AFK-Kick resulting in schematics not removed 2020-03-10 06:33:42 +01:00
ea45eb1942 Hotfixing AutoLoader spam messages due to wrong handling 2020-03-08 08:22:34 +01:00
f79104e94e WorldEdit autofreeze 2020-03-01 16:02:14 +01:00
8bf5a3b4cd WorldEdit autofreeze 2020-03-01 15:43:32 +01:00
1cfaa01f0e WorldEdit autofreeze 2020-03-01 15:37:38 +01:00
dc47138490 All OP 2020-02-25 18:04:38 +01:00
b91799570a Hotfix giving everybody fawe.admin permission 2020-02-21 16:58:00 +01:00
67ec4f955a Adding AFKStopper 2020-01-27 07:04:47 +01:00
ba9f27ba61 Hotfix (try) of MethodNotFound error 2020-01-20 18:16:15 +01:00
269cbb163c Automatic BauServer stop after 60s running without player 2020-01-19 07:01:07 +01:00
Yaruma3341
efa544d80c hotfix 2020-01-12 18:16:29 +01:00
08db379a5e Hotfix freeze 2020-01-12 16:46:11 +01:00
2a212e30f5 Merge branch 'scoreboard' of SteamWar/BauSystem into master 2020-01-12 16:42:09 +01:00
Yaruma3341
a27344af1c hotfix and code cleanup 2020-01-12 15:31:27 +01:00
Yaruma3341
43e40665d3 hotfix 2020-01-11 21:38:34 +01:00
Yaruma3341
fc14d83754 added tps 2020-01-11 12:48:45 +01:00
7ada6b102c Formatting hotfixes 2020-01-10 15:43:53 +01:00
6cd9ae6234 Hotfix 2020-01-10 15:42:04 +01:00
BuildTools
ae9d54fe0d fix 2020-01-09 20:12:51 +01:00
BuildTools
227646226b fix 2020-01-09 20:11:09 +01:00
Yaruma3341
3fdb9072f8 hotfix 2020-01-08 23:50:07 +01:00
Yaruma3341
0657ac404b added scoreboard 2020-01-07 23:22:31 +01:00
BuildTools
5f93b3f023 added /clear <Player> command and registered it in BauSystem.java 2020-01-07 21:30:04 +01:00
BuildTools
432af1d6f6 added /clear <Player> command and registered it in BauSystem.java
update: clear als void formuliert + statt admin world berechtigumg um andere zu clearen + mehr leerzeilen + kleinere optimierungen
2020-01-07 21:27:27 +01:00
BuildTools
c0a70570c1 added /clear <Player> command and registered it in BauSystem.java 2020-01-07 16:38:45 +01:00
4cf2219f46 Adding permissions for FAWE-Less 1.15 Bauserver 2020-01-03 17:01:28 +01:00
77fe1090c1 Fixing CommandSkull 2019-12-31 15:54:27 +01:00
3e6495eb1a Making BauSystem fully 1.15 compatible 2019-12-31 14:39:12 +01:00
94a138b9ec Fixing sections.yml 2019-12-31 13:02:15 +01:00
a389fa9756 Allowing UserID as WorldName 2019-12-31 12:58:55 +01:00
574543c673 Hotfix #2 2019-12-22 18:05:39 +01:00
638a27966a Hotfix 2019-12-22 18:01:52 +01:00
f49fe41d37 Adding api-version 2019-12-21 21:07:58 +01:00
feb21afa92 Adding first 1.15 support 2019-12-21 21:02:11 +01:00
BuildTools
66f615f228 added aliases 2019-11-23 22:04:00 +01:00
BuildTools
aa96f91abc code cleanup 2019-11-23 21:45:09 +01:00
BuildTools
ff49a0451a code cleanup 2019-11-23 21:39:48 +01:00
BuildTools
7720f020bd added lockschem 2019-11-23 21:36:49 +01:00
68abb4d42f Changing maven build 2019-11-20 14:14:34 +01:00
a4d748b392 Beginning with 1.14 support 2019-11-18 18:43:33 +01:00