Commit Graph

1026 Commits

Author SHA1 Message Date
Rsl1122
c268a44dcd Merge branch '4.0.0-Connection-Pool-Branch' of https://github.com/Rsl1122/Plan-PlayerAnalytics into 4.0.0-Connection-Pool-Branch
# Conflicts:
#	Plan/test/test/java/main/java/com/djrapitops/plan/database/DatabaseTest.java
#	Plan/test/test/java/utils/TestInit.java
2017-08-23 22:16:30 +03:00
Rsl1122
b4abc6a776 Merge branch '4.0.0-Connection-Pool-Branch' of https://github.com/Rsl1122/Plan-PlayerAnalytics into 4.0.0-Connection-Pool-Branch
# Conflicts:
#	Plan/test/test/java/main/java/com/djrapitops/plan/database/DatabaseTest.java
#	Plan/test/test/java/utils/TestInit.java
2017-08-23 22:16:12 +03:00
Rsl1122
f7a99d0789 Merge pull request #271 from Rsl1122/4.0.0-BungeeCord-Support
Mid branch PR 4.0.0 Main branch -> Connection-Pool-Branch
2017-08-23 22:02:51 +03:00
Rsl1122
90cab04406 Merge branch '4.0.0-Connection-Pool-Branch' into 4.0.0-BungeeCord-Support 2017-08-23 22:02:41 +03:00
Rsl1122
6cd18c8d30 Database Tests 2017-08-23 21:53:17 +03:00
Rsl1122
c84e8f434e TPSTable, TPSInsertProcessor 2017-08-23 19:01:58 +03:00
Rsl1122
1ca145165c UserInfo table, Removed InspectCache, Rewrote UserData 2017-08-23 18:48:06 +03:00
Fuzzlemann
7de5072bc5 Add Graph Tests 2017-08-23 17:43:52 +02:00
Rsl1122
6998def8df Move testfolder cleaning to TestInit 2017-08-23 17:25:12 +03:00
Rsl1122
05e06ebb76 Merge pull request #270 from Fuzzlemann/master
PR for 4.0.0 (Fuzzlemann) (6)
2017-08-23 17:13:06 +03:00
Fuzzlemann
68f8159027 Closes 2 not-closed sets
Add error-handling if the processor wasn't added into the Queue
2017-08-23 14:43:44 +02:00
Fuzzlemann
a5d90f092d Fix Tests 2017-08-23 14:33:51 +02:00
Fuzzlemann
7587792c73 Add missing endTransactions
Rename usingHTTPS() to isUsingHTTPS()
2017-08-23 14:25:50 +02:00
Fuzzlemann
8bffdba725 Fix compilation error 2017-08-23 14:11:50 +02:00
Fuzzlemann
2df6169dd9 Merge branch '4.0.0-BungeeCord-Support' of https://github.com/Rsl1122/Plan-PlayerAnalytics
# Conflicts:
#	Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java
#	Plan/src/main/java/com/djrapitops/plan/database/Database.java
#	Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
#	Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java
#	Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java
#	Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
#	Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
#	Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java
2017-08-23 14:11:08 +02:00
Rsl1122
fe3a4fdbf1 Fix Compile issues 2017-08-23 14:25:54 +03:00
Rsl1122
5ee7b9de35 Cleaned up TPSTable column variables 2017-08-23 14:09:58 +03:00
Rsl1122
3ea691f4d0 Cleaned up createTable methods 2017-08-23 14:02:39 +03:00
Rsl1122
c205a85a6a Deleted KillHandling, Cleaned Database RemoveUser methods 2017-08-23 13:56:44 +03:00
Rsl1122
f635ccbf0a UsersTable, processing 2017-08-23 13:39:14 +03:00
Rsl1122
a4ae93390c Formatted SecurityTable 2017-08-23 12:53:17 +03:00
Rsl1122
4516ab81bf NicknamesTable 2017-08-23 12:48:24 +03:00
Rsl1122
75d1a3e88c DB Formatting 2017-08-23 12:31:34 +03:00
Rsl1122
3c8d8bc8a8 WorldTimesTable 2017-08-23 12:11:18 +03:00
Fuzzlemann
dc08f96d43 Removes DBCommitProcessor 2017-08-23 10:42:19 +02:00
Rsl1122
1c49dfbdfd KillsTable 2017-08-23 11:29:33 +03:00
Rsl1122
c6fbb12d2d SessionTable 2017-08-23 10:51:46 +03:00
Fuzzlemann
5de5ea25a8 Fix Test Suite 2017-08-22 20:27:01 +02:00
Fuzzlemann
654ff26fb6 Fixes Clearing of the data, the pool itself 2017-08-22 19:44:59 +02:00
Fuzzlemann
82da226edb First try on Connection Pool 2017-08-22 18:26:59 +02:00
Fuzzlemann
6f807c123d Merge branch '4.0.0-BungeeCord-Support' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-22 17:23:58 +02:00
Rsl1122
c1399a52e2 Fixed Compiling & Test suite (Green again) 2017-08-22 18:23:34 +03:00
Fuzzlemann
2f8e881519 Merge branch '4.0.0-BungeeCord-Support' of https://github.com/Rsl1122/Plan-PlayerAnalytics
# Conflicts:
#	Plan/src/main/java/com/djrapitops/plan/Plan.java
#	Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanDeathEventListener.java
2017-08-22 16:37:06 +02:00
Rsl1122
8895aca0ff Start SessionTable (not finished) 2017-08-22 17:32:19 +03:00
Rsl1122
44c9ee3925 CommandUseTable, Plan.getServerUUID method. 2017-08-22 16:20:18 +03:00
Rsl1122
fe9c32c324 ActionsTable, moved some column declarations 2017-08-22 15:28:05 +03:00
Rsl1122
91415d9125 Deleted HandlingInfo 2017-08-22 14:02:53 +03:00
Rsl1122
af63e3cb92 Periodic DBCommit task. Removed remaints of KillData victimID 2017-08-22 12:30:27 +03:00
Rsl1122
8e2e710f98 Chat Name change processing 2017-08-22 12:12:01 +03:00
Rsl1122
cc8fcbe5b8 World Change Processing 2017-08-22 12:10:37 +03:00
Rsl1122
a5eb08e39d GameMode change Processing 2017-08-22 12:09:32 +03:00
Rsl1122
8002864c73 Kill Processing 2017-08-22 12:06:02 +03:00
Rsl1122
96ff3b3fbf Logout & Kick Processing
Renaming handler to dataCache
Death Processing
2017-08-22 11:55:26 +03:00
Rsl1122
5a7aa662e5 Logout & Kick Processing
Renaming handler to dataCache
2017-08-22 11:21:58 +03:00
Rsl1122
b9c9f4d950 More Login processing. 2017-08-22 11:00:27 +03:00
Rsl1122
997ec683ae Renamed SessionData to Session
Started work on Login Processing
Changed some GeolocationCache public access methods to private.
2017-08-22 10:44:05 +03:00
Fuzzlemann
dee25eff4c Update hashCode() and equals() 2017-08-21 21:41:44 +02:00
Fuzzlemann
685bac0c57 Update toString() 2017-08-21 21:39:46 +02:00
Fuzzlemann
9790b6cb73 PR for 4.0.0 (Fuzzlemann) (5) (#267)
* Add check for the server key

* Fix Kill Detection when the player is killed by an Arrow

* Change some WorldTimes methods

* Fixes #260
Fixes JavaDoc at MathUtils

* Fix Error

* Fix Error
2017-08-21 21:29:40 +03:00
Fuzzlemann
424ee0dffc Fix Error 2017-08-21 19:56:07 +02:00