Commit Graph

287 Commits (b0229590053e8dde1dd5f39458749258084f9cb3)

Author SHA1 Message Date
Edzell b022959005 fix variable naming and client compatability issues 2022-05-14 18:30:55 +02:00
Riley c3fe13d096
Merge pull request #103 from ev2-1/plugin_interact
Plugin interact
2022-05-12 09:33:51 +02:00
Riley 559ccaf253 requested changes 2 2022-05-11 20:52:20 +02:00
HimbeerserverDE 0e92b7ba44
Merge pull request #104 from ev2-1/activeobject_prepend_fix
activeobject prepend fix
2022-05-11 17:16:22 +02:00
Riley 562f688965 requested changes 2022-05-11 11:17:37 +02:00
Riley ee21f61717 Deleted "this" 2022-05-11 11:08:31 +02:00
Riley ad8ab4e145 activeobject prepend fix 2022-05-10 18:39:43 +02:00
Riley 308b7ae083 some revert things, because limited scope 2022-05-10 18:33:00 +02:00
Edzell 4e602d1c73 Plugin interact 2022-05-10 18:28:34 +02:00
Riley 517c85caa1
Merge branch 'HimbeerserverDE:main' into ev2-1-dev 2022-05-10 16:10:26 +02:00
HimbeerserverDE 9a06c8f860
Re-add duplicate server check but do it properly this time 2022-05-03 08:06:07 +02:00
HimbeerserverDE 4ce3bade10
Remove duplicate server check 2022-05-03 08:03:16 +02:00
HimbeerserverDE d8cc8cd28a
Use JSON object instead of array to properly represent the server map and not cause an error on startup 2022-05-03 07:57:25 +02:00
HimbeerserverDE fd2bfca06f
Fully fix the docs 2022-05-03 07:49:19 +02:00
HimbeerserverDE ac48fa982e
Fix documentation (Server slice => map) 2022-05-03 07:47:31 +02:00
HimbeerserverDE df1eecbee5
Rename DefaultSrv* to DefaultServer*
@DerZombiiie please test this version. Feel free to upgrade to the latest proxy version in the chatcommand repo.
2022-05-02 22:04:52 +02:00
HimbeerserverDE 66498fe02b
Export and use DefaultSrvInfo method 2022-05-02 22:01:18 +02:00
HimbeerserverDE ce203b8f18
Store servers in a map
Closes #100
2022-05-02 21:57:38 +02:00
HimbeerserverDE c32739ab92
go fmt 2022-05-02 19:33:52 +02:00
HimbeerserverDE cd1ccf7001
Remove newline 2022-05-02 19:33:19 +02:00
Riley ee77906613
Merge pull request #5 from HimbeerserverDE/main
fetch upstream
2022-05-02 19:08:06 +02:00
Riley df6906b139
Merge branch 'ev2-1-dev' into main 2022-05-02 19:07:48 +02:00
HimbeerserverDE eed53c99c0
Merge branch 'ev2-1-texturePools' 2022-05-01 22:26:16 +02:00
HimbeerserverDE 74ff3847ea
Prepare #102 for merge 2022-05-01 22:25:10 +02:00
Riley abb4aefdab merge 2022-05-01 21:06:12 +02:00
Riley fbf490c12b texturePool things regarding to Issue #101 2022-05-01 20:52:17 +02:00
HimbeerserverDE 1b2d0d40f7
Make AddServer require at least one media pool member 2022-05-01 18:19:22 +02:00
HimbeerserverDE 5ba1fb6132
Document media pools 2022-05-01 18:02:48 +02:00
HimbeerserverDE d537e252b2
Fix inconsistent use of TexturePool and MediaPool 2022-05-01 17:22:24 +02:00
HimbeerserverDE dc0a2e5516
Merge branch 'ev2-1-texturePools' 2022-05-01 17:13:30 +02:00
HimbeerserverDE 34d33d51ac
Prepare process.go for merge 2022-05-01 17:05:06 +02:00
HimbeerserverDE 95ead43297
More sc.prefix => sc.mediaPool replacement 2022-05-01 17:02:50 +02:00
HimbeerserverDE 8ba3bec386
Slightly improve Server.TexturePool documentation 2022-05-01 17:00:33 +02:00
HimbeerserverDE 7719e4c65a
Remove TexturePool as it's unneeded for a minimal configuration file 2022-05-01 16:58:57 +02:00
HimbeerserverDE c886245d8e
Media pool tidying 2022-05-01 16:58:11 +02:00
HimbeerserverDE b8fb482ff9
Fix UniquePoolServers behavior and quality 2022-05-01 16:33:37 +02:00
HimbeerserverDE d3bb6d699c
Merge branch 'texturePools' of github.com:ev2-1/mt-multiserver-proxy into ev2-1-texturePools 2022-05-01 16:20:20 +02:00
HimbeerserverDE 08771a1784
More logical handling of dynamic servers and config reloading
Fixes #97
2022-05-01 16:14:16 +02:00
HimbeerserverDE 5f96314dd4
Refuse to RmServer if players are connected to it 2022-05-01 15:37:05 +02:00
HimbeerserverDE c259048067
Correct version string 2022-05-01 10:30:16 +02:00
Riley f525780f39 Merge branch 'main' of https://github.com/ev2-1/mt-multiserver-proxy into texturePools 2022-05-01 10:29:40 +02:00
Riley 736c1a43e3
Merge branch 'HimbeerserverDE:main' into texturePools 2022-05-01 10:29:29 +02:00
HimbeerserverDE fabb8e2400
Make chat command handlers run concurrently
They can't hang the packet handler anymore and the user is warned if commands take a lot of time to run
2022-05-01 10:28:41 +02:00
Riley 8c912346ba Merge HimbeerserverDE:main -> ev2-1:texturePools 2022-05-01 10:26:33 +02:00
Riley d0a5460248 texturePools documentation 2022-05-01 10:16:58 +02:00
Riley 01c26985b1 texturePools! 2022-05-01 10:14:27 +02:00
HimbeerserverDE c71129fdf4
Warn about config reloading overwriting runtime changes 2022-05-01 09:54:44 +02:00
HimbeerserverDE b870182c52
Make RmServer return nothing
The server is guaranteed to not exist and if you need to look that up you should just do it directly
2022-05-01 09:47:55 +02:00
HimbeerserverDE b91b3cfa50
Improve AddServer and RmServer documentation 2022-05-01 09:43:36 +02:00
HimbeerserverDE f6212aeeee
Rename DelServer to RmServer
Closes #95
2022-05-01 09:33:43 +02:00