SteamWar/SpigotCore
Archiviert
13
0
Commit graph

553 Commits

Autor SHA1 Nachricht Datum
Chaoscaot
e88f183e72 Add InUse 2021-01-09 12:13:03 +01:00
Chaoscaot
63d59121b3 Add KitId 2021-01-09 11:49:29 +01:00
Chaoscaot
f760ce58d9 Merge branch 'master' into multi-kit 2021-01-09 10:56:54 +01:00
7562a307ff Hotfix mass errors 2021-01-07 18:01:19 +01:00
Chaoscaot
c65746547f Add SaveFromBytes 2021-01-07 17:04:51 +01:00
Chaoscaot
40c2462d5b Add SaveFromBytes 2021-01-07 15:29:59 +01:00
Chaoscaot
e32c80af3f Extend PersonalKit 2021-01-07 15:25:52 +01:00
731cb9968b Merge pull request 'Add TeamColor' (#85) from team-color into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-01-02 09:37:23 +01:00
99e5659e79 Don't log Custom particles 2021-01-02 09:31:59 +01:00
4e02dc6c59 Remove abgebrochene Prüfvorgänge 2021-01-01 10:02:44 +01:00
Chaoscaot
d35207f384 Fixing 2020-12-29 14:48:43 +01:00
Chaoscaot
98de83c22a Fixed Color Code 2020-12-28 19:08:10 +01:00
Chaoscaot
1a2f3c111f Add TeamColor 2020-12-28 17:44:40 +01:00
13db80aa21 Fix hotfix 2020-12-26 20:14:33 +01:00
1b4507c7e2 Merge pull request 'Add versionDependantCall, See #144 BauSystem' (#80) from VersionDependantCalls into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-12-25 23:10:53 +01:00
jojo
68155e228a Change Schematic version dependant calls 2020-12-25 21:01:03 +01:00
jojo
2c0c75e6ea Change Schematic version dependant calls 2020-12-25 19:12:24 +01:00
jojo
c646bf9533 Change Schematic version dependant calls 2020-12-25 19:06:12 +01:00
jojo
f3ada581af Change Schematic version dependant calls 2020-12-25 18:35:45 +01:00
jojo
e0f6b2e5bf Fix Typo 2020-12-25 18:32:00 +01:00
jojo
e01a72a42b Simplify VersionedCallable
Simplify VersionedRunnable
Remove ExceptionlessCallable
2020-12-25 18:30:46 +01:00
2e1467891e Remove logged messages 2020-12-25 17:37:28 +01:00
jojo
ad28b4fb4e Hotfix 2020-12-25 16:24:42 +01:00
jojo
2fc65a22ec Force Rebuild 2020-12-25 15:59:08 +01:00
jojo
1927bc5bcc Force Rebuild 2020-12-25 15:56:45 +01:00
jojo
f2b01894af Force Rebuild 2020-12-25 15:54:33 +01:00
jojo
c283a8403b Force Rebuild
Testing compiler
2020-12-25 15:47:53 +01:00
jojo
1cbe7c83d5 Force Rebuild
Testing compiler
2020-12-25 15:35:05 +01:00
jojo
1c7709bad8 Force Rebuild
Testing compiler
2020-12-25 15:31:12 +01:00
jojo
97a766c797 Fix naming
Fix SecurityException
2020-12-24 14:44:03 +01:00
jojo
65f747fdb3 Simplify VersionedCallable
Simplify VersionedRunnable
2020-12-24 14:24:48 +01:00
e3e38d6a05 Fix typo 2020-12-24 13:41:08 +01:00
jojo
19394d03ee Update to Core.versionDependantCall 2020-12-24 12:56:17 +01:00
jojo
1b188977a0 Add Copyright
Optimize Imports
2020-12-24 12:07:11 +01:00
jojo
8468d9a13e Add versionDependantCall, See #144 BauSystem 2020-12-24 12:04:50 +01:00
d5e7f82c5b Improve GUI 2020-12-24 09:42:56 +01:00
dc92ce6fda Hotfix TPSZone 2020-12-22 08:36:38 +01:00
1e6c349880 Hotfix SWListInv 2020-12-22 08:32:42 +01:00
e3eeb3607e Switch to consumer + remove debug message 2020-12-21 17:27:31 +01:00
50d3252276 Implementing AnvilGUI + optional CustomItems in SWListInv + Refactoring 2020-12-21 12:59:49 +01:00
c69abf4470 Merge pull request 'Update links and timestamp on multiple link accesses' (#77) from updateLinks into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-12-19 12:25:12 +01:00
dba63ffa90 Fix naming 2020-12-19 12:19:01 +01:00
ea025bb424 Merge pull request 'Fix resourceBundleLoading' (#76) from fixMessageLoading into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-12-19 12:18:27 +01:00
bb1229463b Hotfix multiplication issue 2020-12-19 11:53:51 +01:00
46f05820d8 Remove uneditable sign warning from database 2020-12-19 11:42:50 +01:00
f00ffb32a5 Update links and timestamp on multiple link accesses 2020-12-19 09:22:50 +01:00
4c290d5d3c Fix resourceBundleLoading 2020-12-18 15:48:34 +01:00
26c67801d0 Minimize SQL queries 2020-12-15 21:03:08 +01:00
af12de9e41 Patch my wishes 2020-12-15 19:34:27 +01:00
Chaoscaot
658946d4da Extracting BungeeGUI Changes 2020-12-08 17:25:27 +01:00
61a667ae98 Hotfix scoreboard 2020-12-08 16:56:55 +01:00
8c930a77bd Hotfix scoreboard 2020-11-30 06:32:11 +01:00
9b01caa1b6 Hotfix scoreboard 2020-11-30 06:30:49 +01:00
0de9f9bb06 Hotfix scoreboard 2020-11-30 06:26:53 +01:00
872067bc58 Update description 2020-11-29 20:13:14 +01:00
79494c8650 Rework SWScoreboard to ProtocolLib and remove unneccassary Versiondependents 2020-11-28 21:58:15 +01:00
43e5429f5d Adding ignored messages 2020-11-27 14:33:00 +01:00
053ef13305 Merge pull request 'Changing Color on Bauserver' (#68) from farb-aendern into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-11-18 09:51:58 +01:00
432ae0841e Adding ignored messages 2020-11-18 09:34:32 +01:00
37cd870ac2 Adding ignored messages 2020-11-18 09:29:31 +01:00
Chaoscaot
fb59bf4317 Fixing player.playSound in 1.8 2020-11-15 11:22:45 +01:00
Chaoscaot
05e8a83228 Fixing player.playSound in 1.12 2020-11-15 11:06:13 +01:00
e0172f495d Adding ignored messages 2020-11-15 11:01:36 +01:00
ebee8ae347 Fix launch exceptions 2020-11-15 08:14:40 +01:00
4aed213c17 Ignore more 2020-11-15 08:04:48 +01:00
ac633a8f4c Adding ingorereason 2020-11-13 14:50:17 +01:00
3f544d486a Remove unneccessary logged warnings 2020-11-12 14:19:47 +01:00
7cccbbd267 Remove unneccessary logged warnings 2020-11-11 15:39:15 +01:00
94a28078bd Remove unneccessary logged warnings 2020-11-11 15:36:27 +01:00
8794e1c50f Remove unneccessary logged warnings 2020-11-11 15:09:35 +01:00
436341e25d Remove unneccessary logged warnings 2020-11-11 14:54:48 +01:00
e039392d01 Remove unneccessary logged warnings 2020-11-11 13:45:02 +01:00
c6c101a40f Also log warnings 2020-11-10 10:36:58 +01:00
Chaoscaot
9bdc4b2f1d Changing Color on Bauservers 2020-11-08 16:36:08 +01:00
6bdb25a3c1 Fix and simplify YoyoNows solution 2020-11-07 11:32:38 +01:00
b0848d3e78 Fix bugs 2020-11-07 11:04:54 +01:00
00c7ce90a8 Merge branch 'master' into TPS 2020-11-07 11:01:45 +01:00
jojo
27d1371e7c Fix default getTPS() limit on 20 TPS 2020-10-30 23:14:56 +01:00
91f3b35ed9 Implementing SpectateSystem column. 2020-10-30 13:52:28 +01:00
245eb3be74 Implementing tablist name packet 2020-10-29 09:31:50 +01:00
jojo
2c76604bb5 Add Copyright Notice 2020-10-12 12:50:35 +02:00
jojo
599755a527 Fix TPSWatcher for 10 seconds 2020-10-04 18:18:55 +02:00
jojo
bb2bf2577e Optimize TPSWatcher
Remove 30 seconds TPSWatching
2020-10-04 18:11:19 +02:00
jojo
f83b1359c6 Optimize TPSWatcher 2020-09-27 17:28:32 +02:00
jojo
3959e3c8b8 Optimize TPSWatcher 2020-09-27 17:27:00 +02:00
jojo
987f4f5477 Add TPSWatcher 2020-09-27 15:59:25 +02:00
Chaoscaot
7f4618ec16 Fixed Colors for 1.12 2020-09-26 20:55:42 +02:00
Chaoscaot
fddfe288dc Code Cleanup 2020-09-24 14:11:51 +02:00
Chaoscaot
ee7e68eaae Code Cleanup 2020-09-24 14:09:19 +02:00
Chaoscaot
00b9809cde Merge remote-tracking branch 'origin/master' into packet-system
# Conflicts:
#	SpigotCore_Main/src/de/steamwar/sql/DownloadSchematic.java
2020-09-23 17:14:02 +02:00
23ff60b241 Hotfix java 11 exception 2020-09-23 17:12:42 +02:00
Chaoscaot
a8f88935df Code Cleanup 2020-09-21 23:22:50 +02:00
Chaoscaot
fc28403750 Add License 2020-09-20 12:14:36 +02:00
Chaoscaot
09aba7244e Remove Debug Message 2020-09-20 12:01:50 +02:00
Chaoscaot
2155e386fd Bungee GUI Improvements 2020-09-20 12:01:12 +02:00
Chaoscaot
00c08fc8ad Add Bungee GUI Prototype 2020-09-19 12:39:22 +02:00
Chaoscaot
691abd0dea Add Stuff for Bungee GUI 2020-09-16 21:22:39 +02:00
Chaoscaot
2dcecc5a62 Add Basic Packet System 2020-09-15 22:54:39 +02:00
7f6302a0ce Merge pull request 'Allow null schems' (#58) from allow_nulled_schems into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-09-06 20:03:44 +02:00
29dc01684a Merge pull request 'Add SWActionListInv' (#57) from TNTTracerInventory into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-09-05 14:44:45 +02:00
jojo
d856d4d476 Add SWActionListInv
Add SWActionBar
2020-09-05 14:30:31 +02:00
d7a2830bd8 Allow null schems 2020-09-04 18:01:25 +02:00
8ecc58cb72 Prepare open source release 2020-08-26 19:00:35 +02:00
3bc9834782 Hotfix POI data mismatch mismatch 2020-08-18 17:58:34 +02:00
16a53462f1 Hotfix POI data mismatch mismatch 2020-08-15 18:11:28 +02:00
dc2d6c9a89 Hotfix leaving BE players 2020-07-26 15:26:26 +02:00
d74f08b179 Fix AirShip-Testarena startup 2020-07-26 08:11:48 +02:00
743e40c9ce Fix BedrockEdition inability for Non-Full-Chunk packets 2020-07-25 12:58:11 +02:00
021a189823 Speed server start up 2020-07-21 17:07:13 +02:00
1b17b513d2 Merge pull request 'Implementing first multilingual framework' (#52) from multiLingualFramework into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-07-16 18:09:33 +02:00
c943520418 Implementing Elo database connection 2020-07-07 18:48:24 +02:00
90368b6600 Adding fightplayer fix 2020-07-04 10:59:24 +02:00
7f2be86849 Implementing first multilingual framework 2020-07-04 10:21:21 +02:00
35cad5e64c POI data mismatch ignoring 2020-06-22 13:06:57 +02:00
c0e6a0d1b6 Hotfix 2020-05-21 21:37:35 +02:00
31629db692 Implementing rank system 2020-05-12 09:10:24 +02:00
abd9815de9 Adding schematic by id method 2020-04-30 15:43:58 +02:00
5534cfb6d9 Hotfix recipe spam 2020-04-11 13:04:46 +02:00
376f285b5e Fix dependencies 2020-04-02 08:31:36 +02:00
111d99cf8b Reducing exception spam 2020-03-28 10:26:26 +01:00
b0e2b9ee02 Reducing exception spam 2020-03-22 07:52:36 +01:00
78b57a78db Load 1.15 Schems in 1.12 2020-02-22 15:20:01 +01:00
4a9a678a63 Merge branch 'master' into schemType
# Conflicts:
#	SpigotCore_Main/src/de/steamwar/sql/Schematic.java
2020-02-22 11:21:07 +01:00
b5c1eb0823 Fixing NPE on disconnect 2020-02-10 14:58:13 +01:00
151ec960bb Rework SQL statements to actually use PreparedStatements for security reasons 2020-02-07 16:45:02 +01:00
a6d5e70f46 Merge remote-tracking branch 'origin/master' 2020-02-01 14:47:33 +01:00
0ecf0b1a42 Hotfix of missing SchemData NPE 2020-02-01 14:47:23 +01:00
87f512bf2f Merge branch 'dynamic_instanciation' of SteamWar/SpigotCore into master 2020-01-28 06:29:07 +01:00
9df9439120 Hotfixing disabled 2020-01-26 13:43:20 +01:00
1e0856d9bb Merge branch 'removing_pair' of SteamWar/SpigotCore into master 2020-01-26 08:40:38 +01:00
ef01e8f685 Fixing checktype classification 2020-01-25 14:04:07 +01:00
f883220618 Fixing dynamic implementation 2020-01-25 13:47:16 +01:00
f34cfdd254 Revert "Hotrevert to static instanciation"
This reverts commit 9eb46e7a
2020-01-25 12:51:45 +01:00
59cac59fe9 Revert "Hotfix static instanciation"
This reverts commit 86254479
2020-01-25 12:51:29 +01:00
f44fe64a43 Log players 2020-01-25 09:35:02 +01:00
f77604e6ec Do not log complete server crashes 2020-01-25 09:20:30 +01:00
f3b5838a16 Hotfix NPE 2020-01-21 21:42:05 +01:00
c8bf5e7c76 Adding exception for POI data mismatch 2020-01-21 17:47:52 +01:00
8625447969 Hotfix static instanciation 2020-01-20 07:17:40 +01:00
9eb46e7a0f Hotrevert to static instanciation 2020-01-20 07:15:53 +01:00
57ada4b9e0 Hotfix Schemtype fromDB NPE 2020-01-20 07:07:19 +01:00
ed3e6a3e46 Hotfix Schemtype fromDB NPE 2020-01-20 07:05:52 +01:00
c1981cf66a Hotfix Schemtype fromDB name 2020-01-20 07:00:48 +01:00
7f167e73ea Hotfix SchematicType 2020-01-20 06:59:15 +01:00
f08decf551 Merge branch 'statistics' of SteamWar/SpigotCore into master 2020-01-20 06:45:45 +01:00
58f26a5b3f Merge branch 'reduceErrorSpam' of SteamWar/SpigotCore into master 2020-01-20 06:39:17 +01:00
cf913ae61d Adding personal kits for WarGears o.a. 2020-01-19 17:52:48 +01:00
f6f2c7ce9a Remove logging of Block at XXX should be XXX messages 2020-01-19 16:25:15 +01:00
5c176b0afb Dynamic instanciating of SchematicTypes 2020-01-19 16:19:53 +01:00
92c3a810a6 Hotfix failing setup due to missing dependencies 2020-01-19 14:40:58 +01:00
364d3f8f83 WIP: Dnamic SchemType rework 2020-01-19 14:37:59 +01:00
21a2be5a43 Adding statistics backend 2020-01-19 08:45:01 +01:00
052aa44d12 Removing pair completly 2020-01-19 07:41:43 +01:00
30bba43e45 Saving exceptions to database 2020-01-18 12:13:25 +01:00
0fedaec64f Early prototype of SpongeSchemLoader in 1.12- 2020-01-17 16:52:40 +01:00
3bfa83d556 Useless commit 2020-01-15 18:49:41 +01:00
Yaruma3341
020aac870c hotfix 2020-01-12 18:22:46 +01:00
98d5be1e07 Merge branch 'scoreboard' of SteamWar/SpigotCore into master 2020-01-11 20:25:59 +01:00
Yaruma3341
fce272f366 complete rework 2020-01-11 17:31:38 +01:00
712f82584a There was never WarShip 1.10 2020-01-09 18:50:20 +01:00
787543ab59 Merge branch 'scoreboard' of SteamWar/SpigotCore into master 2020-01-08 06:52:05 +01:00
8608ceb738 Merge branch 'softRemovalOfPair' of SteamWar/SpigotCore into master 2020-01-08 06:44:28 +01:00
Yaruma3341
e485927a4b code cleanup and hotfix 2020-01-07 23:25:27 +01:00
7bf299a97f Merge branch 'scoreboard' of SteamWar/SpigotCore into master 2020-01-07 18:12:16 +01:00
2231a5d6e8 Adding functions for working without pair 2020-01-07 06:59:19 +01:00
Yaruma3341
1c748cc5b9 hotfix 2020-01-06 21:22:16 +01:00
Yaruma3341
5705e1d87d hotfix 2020-01-06 20:13:46 +01:00
Yaruma3341
6883b7efc2 added scoreboard; tested; added *.iml 2020-01-06 20:11:35 +01:00
4b2427527f Removing WS 1.14 2020-01-06 12:15:06 +01:00
38303d1315 Adding/removing Schemtypes 2020-01-06 12:05:27 +01:00
6e7c05b4f0 Hotfix 2019-12-31 15:51:11 +01:00
a5e906537a Changing to String ItemSkull 2019-12-31 15:11:00 +01:00
5efe47a619 Fixing Skull generation for 1.14+ 2019-12-31 14:57:04 +01:00
5fe26b7d95 Merge branch 'WarShip9+10andWarGear10' of SteamWar/SpigotCore into master 2019-12-28 09:43:26 +01:00
dd36e34fc8 Fixing Schematic deletion 2019-12-27 14:45:04 +01:00
3ba25d1b8f Adding final historic schematic types 2019-12-27 13:08:04 +01:00
0c236bfabe Fixing potential NullPointerException 2019-12-27 12:51:23 +01:00
a7c6ada627 Adding SG-WS-Schematic-Type 2019-12-22 23:39:43 +01:00
da663bdf2c Sorting Schematics 2019-12-22 08:22:52 +01:00
7e070be9d9 Changing downloadlink-generator 2019-12-16 20:32:57 +01:00
3ed64a8b60 Adding SchemDownloadlink-Generator 2019-12-16 19:37:53 +01:00
6cab302ac0 Fixing missing 1.10 support 2019-12-13 16:40:00 +01:00
28db3c0844 Adding 1.9 and 1.10 support 2019-12-13 15:53:40 +01:00
087191be98 Adding Oldschool Schemtype 2019-12-11 22:39:54 +01:00
4fa0297480 Fixing Schematic RAM leak and 1.14 support 2019-12-11 22:34:46 +01:00
efb3e2ce70 Full 1.15 support 2019-12-11 15:30:15 +01:00
a50c09bd9b Optimising Formatcode 2019-12-09 17:44:48 +01:00
c8a77e1755 Removing Eiszeit schematic type 2019-12-09 12:40:55 +01:00
526dc25c5d Adding the used global conversation script 2019-12-09 11:57:53 +01:00
de2e880e0e Adding funktion to check pasteablity 2019-12-09 11:57:53 +01:00
602a4d1098 Removing SQLException 2019-12-09 11:57:53 +01:00
bd6b5f48c3 Rework to save schematics in database 2019-12-09 11:57:53 +01:00
93396a620b Changing artifact name for automated testing 2019-12-06 06:17:37 +01:00
359e668425 Adding 1.15 support 2019-12-05 21:51:27 +01:00
ceee166920 Fixing Eiszeit 2019-12-01 19:33:59 +01:00
4a8206edae Unifying naming 2019-11-20 14:07:57 +01:00
6e30c05b66 Changing build process 2019-11-20 14:05:12 +01:00
e366c3c0ee Changing SchematicType 2019-11-18 18:44:29 +01:00
3d42b4e091 Adding public-team 2019-11-16 08:40:04 +01:00
ecb8eec074 Fixing 1.8 Skull issue 2019-11-11 19:57:17 +01:00
ed452b2856 Fixing Material not found 2019-11-10 23:55:21 +01:00
5e917150c2 1.8 Support 2019-11-10 20:31:28 +01:00
6244c79b63 Massive Refactoring + adding 1.14 support 2019-11-10 17:28:09 +01:00