Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,229 Commits 6 Branches 128 Tags 33 MiB
Commit Graph

595 Commits

Author SHA1 Message Date
Jurgen cc88883dc1 fixed imports, thanks intellij 2023-02-08 19:58:47 +01:00
Jurgen 7b82a9182e implemented user configurable start and stop of cave render 2023-02-08 19:43:20 +01:00
JurgenKuyper 8f62d8e57e
Update markers.js 
fixed issue with standalone webserver and spaces in world name, double urlencode changed %20 to %2520 which didn't resolve to the proper address
 2023-01-17 14:56:45 +01:00
Michael Primm 9f9d12a580 Prevent rare shutdown exception 2022-12-11 21:10:52 -06:00
Michael Primm edf6e256e1 Switch sanitizeHTML to marker load/create/update 2022-12-11 15:44:48 -06:00
Michael Primm 287d900047 Shift from Twitter to Mastodon 2022-12-11 15:43:57 -06:00
mikeprimm d048aad743
Merge pull request #3857 from Warriorrrr/feature/stringify-async 
Stringify json for json file client async
 2022-11-29 15:43:31 -06:00
mikeprimm e0cbd1fe8e
Merge pull request #3867 from surfrock66/dynamicfavicon 
Add better favicon and code for progressive web apps, to improve shortcuts and icons.
 2022-11-29 15:41:33 -06:00
mikeprimm e15f3f8460
Merge pull request #3844 from gmfamily/v3.0 
fix(chnk visibility) Use long to avoid int overflow
 2022-11-29 15:39:40 -06:00
mikeprimm 7d1a273e6d
Merge pull request #3862 from mastermc05/colorful-biomes 
Colorful biomes
 2022-11-29 15:37:42 -06:00
mikeprimm 9f16074a75
Merge pull request #3863 from mastermc05/fix-colors 
Fix colours
 2022-11-29 15:36:46 -06:00
mikeprimm 9a8ef557af
Merge pull request #3866 from IMBArator/fix_locale_issue_ModelBlockModelImpl.getLine 
fix locale issue in ModelBlockModelImpl getLine (closes:  #3854)
 2022-11-29 15:35:49 -06:00
mastermc05 0f8174796c Cache biome object, further reduce diff 2022-11-18 13:12:40 +02:00
Captain Chaos 53b3b7c08b Typo in log message 2022-11-11 12:14:27 +01:00
Joseph Gullo ce54de0cd7 Using the icon for dynmap pulled from the patreon/discord, updated the favicon and related files to produce a more refined Progressive Web App which looks better as a bookmark on mobile operating systems. 2022-10-25 13:11:52 -07:00
mastermc05 a40592021f Fix colours 2022-10-15 12:07:07 +03:00
mastermc05 8a8e2ecfcf Abstract for easier multiversion support, reduce diff 2022-10-14 15:37:36 +03:00
mastermc05 1f1a342777 1.19 support 2022-10-14 12:57:23 +03:00
Warrior 8ce85322dd Stringify json for json file client async 2022-10-01 20:39:46 +02:00
Maximilian Zettler a70530edc8 fix locale issue in ModelBlockModelImpl getLine (closes: #3854) 
add Locale.US to String.format() where float values are used
 2022-09-29 21:02:18 +02:00
gmfamily 61bfe66430
fix(chnk visibility) Use long to avoid int overflow 
Use long representation of the distance between tested chunk and center of tested limit to avoid int overflow while computing the distance compared to limit radius using square delta value
 2022-08-31 19:35:18 +02:00
mikeprimm 66fe5d4a8b
Merge pull request #3833 from JurgenKuyper/v3.0 
added switch on publicURL in webregister message
 2022-08-29 08:29:37 -05:00
mikeprimm 5aaff7cea9
Merge pull request #3836 from JurgenKuyper/templateNotification 
added notification on probable misconfiguration of deftemplatesuffix
 2022-08-29 08:28:53 -05:00
Jurgen d25040e1cf added notification on probable misconfiguration of deftemplatesuffix 2022-08-21 19:32:59 +02:00
Jurgen adfe0471e3 added switch on publicURL in webregister message 2022-08-19 12:29:14 +02:00
Kosma Moczek e32b8d0f77 BiomeMap: use hardcoded grass color in Dark Forest 2022-08-19 00:24:17 +02:00
Mike Primm a6b56dc36e Handle error loading texture pack image without aborting texture pack 
load
 2022-08-14 12:46:43 -05:00
Michele e2da0efd8e
Merge branch 'webbukkit:v3.0' into v3.0 2022-08-08 11:26:06 +02:00
Mike Primm 0ab9c9e47b Recycle JDBC connections idle for more than 60 seconds 2022-08-07 23:48:47 -05:00
Mike Primm 3b0814e853 Adjust biome mapping to handle pathological biome counts per segment 2022-08-06 17:48:27 -05:00
Mike Primm 46bd040981 Add Forge 1.19.2 build 2022-08-06 13:10:06 -05:00
Michele0303 8909fea4b1 multiple cross-site scripting reflected fixed 2022-08-02 19:55:09 +02:00
Michele0303 b5ac020a56 Update MySQL_markers.php 
cross-site scripting reflected fixed
 2022-08-02 19:32:21 +02:00
Евгений 43c1159fae
Fix writing non-ascii files to postgresql database 
This fixes non-ascii chat messages (for example cyrillic utf8) in PostgreSQL_sendmessage.php

Before fix PostgreSQL_sendmessage.php was returning this:

Fatal error:  Uncaught PDOException: SQLSTATE[22P02]: Invalid text representation: 7 ERROR:  invalid input syntax for type bytea in /opt/minecraft/plugins/dynmap/web/standalone/PostgreSQL_funcs.php:81
Stack trace:
#0 /opt/minecraft/plugins/dynmap/web/standalone/PostgreSQL_funcs.php(81): PDOStatement->execute()
#1 /opt/minecraft/plugins/dynmap/web/standalone/PostgreSQL_funcs.php(99): updateStandaloneFileByServerId()
#2 /opt/minecraft/plugins/dynmap/web/standalone/PostgreSQL_sendmessage.php(60): updateStandaloneFile()
#3 {main}
thrown in /opt/minecraft/plugins/dynmap/web/standalone/PostgreSQL_funcs.php on line 81
 2022-07-31 17:06:13 +03:00
Mike Primm b331cfaf27 Fix exception in processEnumMapTiles for Postgres 2022-07-30 21:13:59 -05:00
Mike Primm dc66d12916 Handle null image in MySQL 2022-07-30 18:49:55 -05:00
Mike Primm 082878aade Handle null images 2022-07-30 18:04:28 -05:00
Mike Primm bf8d5eb6cf Fix LIMIT OFFSET order sensitivity (MySQL is kind of dumb...) 2022-07-29 23:10:27 -05:00
Mike Primm 937ab7cee7 Finish fix 2022-07-24 17:54:09 -05:00
Mike Primm a71348c3c8 Add cooment for https://minecraft.fandom.com/wiki/Data_version 2022-07-24 17:52:00 -05:00
Mike Primm 9648457727 Update chunk version color map 2022-07-24 17:50:33 -05:00
Mike Primm 8e27d5defd Handle AOOBX (not sure why yet) 2022-07-24 17:06:28 -05:00
Mike Primm d88ebb0d20 More resume fixes 2022-07-24 15:32:16 -05:00
Mike Primm e13a515baf More SQLite fixes for scan 2022-07-24 15:11:05 -05:00
Mike Primm 8beba92f8e Fix offset/limit on enums 2022-07-24 14:56:25 -05:00
Mike Primm c80f7adb23 Use limit on enum tiles (for cleaner behavior on purge for large maps) 2022-07-24 13:52:49 -05:00
Mike Primm ab54919956 Add more orderly storage shutdown 2022-07-24 13:09:52 -05:00
mikeprimm 2d6bcbbca2
Merge pull request #3783 from JurgenKuyper/v3.0 
updated deprecated interfaces where possible
 2022-07-22 20:59:02 -05:00
mikeprimm c248ce3275
Merge pull request #3784 from JurgenKuyper/brick_fix 
Mud Brick fix in texture_1.txt
 2022-07-22 20:56:51 -05:00
mikeprimm 8f70d5fc3c
Merge pull request #3794 from mastermc05/v3.0 
Fix and improve async chunk load
 2022-07-22 20:56:24 -05:00
Markus Reiter 8e02c21a36
Fix implicit cast. 2022-07-15 03:30:26 +02:00
Markus Reiter ca5d2f4990
Fix implicit cast. 2022-07-15 03:29:16 +02:00
mastermc05 8d8a4d088e fix 1.18.2 2022-07-07 15:26:23 +03:00
JurgenKuyper dd789b3a41
Merge branch 'v3.0' into brick_fix 2022-06-21 21:58:36 +02:00
Jurgen a8af8037cb fixed mud_bricks sides so it is no longer transparent. thanks BlargCraft on Reddit. 2022-06-21 19:58:17 +02:00
JurgenKuyper d93a014c99
Merge branch 'webbukkit:v3.0' into v3.0 2022-06-21 13:59:54 +02:00
tecdude 63ab35a9a5
safari coloured search bar 
added support for coloured bar in apple safari 15+
 2022-06-17 18:47:54 +01:00
mikeprimm e7e8f1c245
Merge pull request #3771 from leon0399/leon0399-patch-1 
feat: URI-encode markers loading world name
 2022-06-12 11:58:59 -05:00
Mike Primm 57b48ba56f Add 1.19 blocks and textures 2022-06-08 00:42:08 -05:00
Leonid Meleshin f8a81ce0ac
feat: URI-encode markers loading world name 2022-06-06 09:51:08 +03:00
mikeprimm 374309e004
Merge pull request #3757 from leon0399/leon0399-patch-1 
fix: support special symbols in world names
 2022-06-05 16:52:30 -05:00
mikeprimm 6306ae59ea
Merge pull request #3763 from RedstoneFuture/v3.0 
Add no-permission message option
 2022-06-05 16:51:21 -05:00
Marijn Doeve 536b96a5f9
Set Initial schema version to 4 2022-05-30 21:27:42 +02:00
RedstoneFuture 078275d16d Add no-permission message option 2022-05-29 15:28:06 +02:00
Leonid Meleshin 505d78a8e0
fix: support special symbols in world names 
Fix #3755
 2022-05-12 19:59:32 +03:00
Jurgen b3169a6442 updated deprecated interfaces where possible, there are still many left, like ForgeRegistry.BIOME, ForgeRegistry.BLOCK_STATE_IDS, and many more I couln't find a fix for. 2022-05-01 16:24:34 +02:00
mastermc05 d0a791b634 Clean and finish x2 2022-04-01 15:16:57 +03:00
mastermc05 da05fc4675 Clean and finish 2022-03-31 16:18:02 +03:00
mastermc05 790f1f4966 Readd ignore chunk loads 2022-03-31 15:04:36 +03:00
mastermc05 4a97550b63 Parallel process and load plans 2022-03-30 19:37:29 +03:00
mikeprimm 971a492964
Merge pull request #3703 from davidjpfeiffer/v3.0 
Small style improvements to marker labels
 2022-03-27 17:59:16 -05:00
Mike Primm d93b836ad0 Add index for Maps table (because SQLite execution planner is stupid) 2022-03-27 13:59:39 -05:00
Mike Primm 7feb9e6735 Fix shading=true/false ambiguity with patch cache lookup 2022-03-26 21:52:40 -05:00
Mike Primm 861d1f8606 Properly bound join in MySQL and SQLite PHP tile lookup 2022-03-26 12:44:41 -05:00
Mike Primm ab76953294 Default flags for MS SQL to ";trustServerCertificate=true" 2022-03-10 14:31:31 -06:00
Mike Primm 53b65ab7e4 Add microsoftsql storage type 2022-03-10 14:30:02 -06:00
Mike Primm aec1f0cdb6 Expand maximum zoom level from 16 to 32 2022-03-10 02:24:27 -06:00
Mike Primm 042f387ecf Add fallback for schema upgrade on ancient MySQL servers 2022-03-08 21:17:32 -06:00
David Pfeiffer f52d2e6c1a
Small style improvements to marker labels 2022-03-05 16:03:44 -08:00
Mike Primm c3d36dfbf2 Use concurrentmap for dirty_worlds 2022-03-01 08:56:50 -06:00
Mike Primm 58a2b16217 Drop apache http client, avoid rebase issues in S3 storage code 2022-02-24 17:54:47 -06:00
Mike Primm cf528d22cc Rebase httpcomponents 2022-02-24 16:34:10 -06:00
Mike Primm 60147e8d16 Handle proxy cascades on X-Forwrded-For 2022-02-22 22:33:33 -06:00
Mike Primm a9b4ace851 Add support for trusted-proxies subnet ranges, handle nested proxies 2022-02-22 22:11:48 -06:00
Mike Primm 037d1803a7 Update candles, candle cake models 2022-02-22 21:14:33 -06:00
Mike Primm 97e5627e0d Fix update URL for AWS S3 2022-02-22 00:57:11 -06:00
Mike Primm f075bf236c Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0 2022-02-22 00:00:38 -06:00
Mike Primm ad226141fe Avoid multithread use of client 2022-02-22 00:00:18 -06:00
Mike Primm 6a95c9231a Zap dynmap_webchat.json if error parsing it 2022-02-21 18:51:31 -06:00
mikeprimm b6d0c816a4
Merge pull request #3685 from ein-stein-chen/fix-biome-color-loading 
Fix loading of biome colorschemes
 2022-02-21 18:45:25 -06:00
Mike Primm 9066fa0135 Fix transparency handling in WEBP tile generation 2022-02-21 17:57:04 -06:00
Mike Primm 10289f85b7 Fix player markers on AWS S3 web 2022-02-20 22:26:30 -06:00
Mike Primm ef045da32f Add prefix path support for AWS S3 website 2022-02-20 21:38:50 -06:00
Mike Primm ea97296684 Get AWS S3 storage based web working 2022-02-20 20:58:21 -06:00
Mike Primm 45bc02cf3a Switch to sdk v2 2022-02-18 00:40:55 -06:00
Mike Primm be43f53d81 Start S3 support 2022-02-17 21:59:53 -06:00
Mike Primm 50dce9b854 Fix comment 2022-02-17 14:35:07 -06:00
Alexander Degenhart ec8d44ea7c
Fix loading of biome colorschemes 2022-02-17 21:33:37 +01:00
Mike Primm 8eb69514f2 Handle bigger tiles in zoom out tiles 2022-02-17 11:33:55 -06:00
Mike Primm 474c5ecca9 Fix render save/restore when tile scale set 2022-02-17 09:15:49 -06:00