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

3004 Commits

Author SHA1 Message Date
Mike Primm a6b56dc36e Handle error loading texture pack image without aborting texture pack 
load
 2022-08-14 12:46:43 -05:00
Mike Primm 0445814ef5 Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0 2022-08-14 00:37:29 -05:00
Mike Primm 4cd915e1ab Switch to 3.4 for release 2022-08-14 00:37:14 -05:00
mikeprimm 171b7c9e54
Merge pull request #3814 from Michele0303/v3.0 
multiple cross-site scripting reflected fixed
 2022-08-13 23:13:58 -05:00
mikeprimm 7ddecaa566
Merge pull request #3821 from stepech/bump-versions 
Bump minimum spigot version, improve armor points counting
 2022-08-13 23:12:28 -05:00
mikeprimm a2c1941585
Merge pull request #3820 from mastermc05/v3.0 
Try to fix rendering at shutdown
 2022-08-13 23:11:23 -05:00
mikeprimm b9e57e4e33
Merge pull request #3823 from kosma/fabric/version-lock 
fabric: version-lock fabric.mod.json
 2022-08-13 23:10:10 -05:00
Kosma Moczek 058599be77 fabric: version-lock fabric.mod.json 
This is intended to reduce user errors where e.g. someone uses the
1.19 jar on 1.19.2. Previously this would lead to unspecific mixin
errors; with this change, a helpful message is shown:

Mod 'Dynmap' (dynmap) 3.4-SNAPSHOT requires version 1.19 of 'Minecraft' (minecraft), but only the wrong version is present: 1.19.2!
 2022-08-11 20:13:22 +02:00
mastermc05 36924b4942 Clear scary stacktraces 2022-08-11 11:36:27 +03:00
stepech 0eb2dffac2
Update minimum spigot api, improve armor points counting 2022-08-08 22:40:27 +02:00
Michele e2da0efd8e
Merge branch 'webbukkit:v3.0' into v3.0 2022-08-08 11:26:06 +02:00
mastermc05 36ea4c3938 Merge branch 'v3.0' of https://github.com/mastermc05/dynmap into v3.0 2022-08-08 11:00:35 +03:00
mastermc05 d0e9b66d4a Try to fix https://github.com/webbukkit/dynmap/issues/3819 2022-08-08 11:00:32 +03:00
Mike Primm f89777a0dd Set to SNAPSHOT 2022-08-07 23:53:31 -05: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
Mike Primm 7570cf5994 Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0 2022-07-31 12:52:22 -05:00
Mike Primm 85f09b9c2f Prep for 3.4 release 2022-07-31 12:52:09 -05:00
mikeprimm fe97e28401
Merge pull request #3811 from JustZhenya/patch-1 
Fix writing non-ascii files to postgresql database
 2022-07-31 12:10:48 -05: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
mikeprimm 7dabbab8c9
Merge pull request #3809 from kosma/fabric-1.19.1 
Fabric 1.19.1
 2022-07-29 20:45:11 -05:00
Kosma Moczek e943a26a5b fabric-1.19.1: fix mixins for 1.19.1 2022-07-30 00:30:10 +02:00
Kosma Moczek 1de1c7ce69 fabric-1.19.1: update Minecraft/Fabric version 2022-07-30 00:30:10 +02:00
Kosma Moczek 682ed12c69 fabric-1.19.1: add to settings.gradle 2022-07-30 00:02:27 +02:00
Kosma Moczek dc0296f845 fabric-1.19.1: s/1.19/1.19.1/g 2022-07-29 23:58:21 +02:00
Kosma Moczek 9cd7a3489a fabric-1.19.1: rename fabric_1_19 -> fabric_1_19_1 2022-07-29 23:55:55 +02:00
Kosma Moczek 4ec0d5af37 fabric-1.19.1: copy from fabric-1.19 2022-07-29 23:53:11 +02:00
Mike Primm 47f5779e6f Back to SNAPSHOT 2022-07-26 17:44:10 -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 e0619ec650 Add ClientWorld hack 2022-07-24 17:24:19 -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
Mike Primm e68f628131 Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0 2022-07-22 21:51:51 -05:00
Mike Primm 00a0d3ed37 Set to SNAPSHOT 2022-07-22 21:51:22 -05:00
mikeprimm fc678a056f
Merge pull request #3782 from PssbleTrngle/v3.0 
add support for fabric permissions & LuckPerms
 2022-07-22 20:59:47 -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