Commit Graph

4611 Commits

Author SHA1 Message Date
IronApollo
238c56a3c6 Revert "Revert matt's changes"
This reverts commit bfcc6184ad.
2020-06-13 14:41:36 -04:00
N0tMyFaultOG
bfcc6184ad Revert matt's changes
Let's not break Fawe, thanks
2020-06-13 18:48:57 +02:00
MattBDev
56f29a3962 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-06-12 21:46:03 -04:00
MattBDev
8105088d60 Minor cleanup 2020-06-12 21:45:49 -04:00
MattBDev
1eacb91267 Make extent public (unsafe) 2020-06-12 21:45:49 -04:00
MattBDev
7cc1994e20 Use StandardCharsets 2020-06-12 21:45:49 -04:00
MattBDev
8a5899459f Use Integer.compare() instead of if statements. 2020-06-12 21:45:49 -04:00
MattBDev
9ce4a415cb Fix errors while using the broken commands 2020-06-12 21:45:49 -04:00
MattBDev
35c2a74c52 Implement more masks 2020-06-12 21:45:49 -04:00
Matthew Miller
33adba4a6f Use a long to refer to the volume of a region to prevent overflow (#1350)
* Use a long to refer to the volume of a region, and rename the method to getVolume

* Fixed issues noted in review

* Forgot to floor

* Fixed review notes

* Can use a long here rather than BigDecimal

* Improve javadocs

* style

(cherry picked from commit 328030fd6281e58a4ea1d0cdd0a2e274da90afbe)
2020-06-12 21:45:49 -04:00
Octavia Togami
a23b182de5 Fix vector gen, always enable BlockMap tests
The BlockMap tests got much faster, so there's no need to hide them
behind a flag.

(cherry picked from commit 1e2496af552891e3b43c5703bda8dc4129bbcc5d)
2020-06-12 21:45:49 -04:00
Octavia Togami
9b7f61a2de Add import to checkstyle
(cherry picked from commit 68be2b3443fc2e7351999bab54dd14c5e972d993)
2020-06-12 21:45:49 -04:00
Octavia Togami
8d6db82764 Add licenses for test files
(cherry picked from commit 300aad3530400124d88c0416afa6c5ddb715d717)
2020-06-12 21:45:49 -04:00
Octavia Togami
518f52ea6e Test more of the math/collections, fix VectorPList
Fixes #1291

(cherry picked from commit e0346ff53b8629a368cdbf62cbd347caecfae5fd)
2020-06-12 21:45:49 -04:00
MattBDev
63b81b801b Implement remove on set/iter views of BlockMap
Fixes #1354.

(cherry picked from commit 637da62e34e676015aa7fbad490cf6f033e55b89)
2020-06-12 21:45:48 -04:00
Matthew Miller
c72f3eeb58 Bump text versions for 1.16 and action bar fixes
(cherry picked from commit 5132c5e8a83812e2341df87e0ac239cc948a0b5f)
2020-06-12 21:45:48 -04:00
MattBDev
9f6e0ebd5c Minor changes to NMS logic 2020-06-12 21:45:48 -04:00
MattBDev
3caf53987f Minor upstream changes 2020-06-12 21:45:48 -04:00
Luracasmus
a4802c57ae Change HTTP to HTTPS in License (#1335)
Change HTTP to HTTPS in LICENSE.

(cherry picked from commit 2363440fb11405dc10a87147bf7c0effa08dc10c)
2020-06-12 21:45:48 -04:00
NotMyFault
e35a1b80c9
Merge pull request #494 from aurorasmiles/updateLinks
Fix a few links
2020-05-30 10:48:20 +02:00
aurorasmiles
6965fe2b90
Update PlotSquaredFeature.java 2020-05-30 10:46:05 +02:00
Aurora
5602b33b78
Fix a few links 2020-05-30 09:17:21 +02:00
dordsor21
75153d8da8 Fix getLightOpacity 2020-05-27 17:25:03 +01:00
dordsor21
bdc14c10c7
Fix relight and removelight (#475)
* Start work on lighting engine (does not build)

* Implement getLighting

* Setting, flushing light etc works. Getting light should be working..?

* Better queue/chunk handling

* Use correct location for lighting update

* Correct set location, remove debug

* cleanup a little

* Fix fixlight

* Apply to all versions for the numpties

* Remove lighting extent if not using

* Actually bitmask blocks when setting in chunks

* Initialise Maps and Dequeues with inital size

* format

* Documentation maybe
2020-05-27 11:45:08 +01:00
dordsor21
1ff5e7761b Comment out not working and add TODO 2020-05-27 11:39:23 +01:00
Aurora
255c20f4ad Fix recursivePickaxe 2020-05-27 11:39:23 +01:00
aurorasmiles
736bd54e20 Update PULL_REQUEST_TEMPLATE.md
Update links, add explanation for Description
2020-05-26 09:39:23 +01:00
Aurora
1f898cd0d1 Negate "hasCollision" for isTranslucent() also for 1.15.0 and 1.14 2020-05-25 19:00:16 +01:00
Aurora
d9240c5626 Negate "hasCollision" for isTranslucent() 2020-05-25 19:00:16 +01:00
Aurora
2de45458d4 Compare using BlockType, not Block for AreaPickaxe, fixes #436 2020-05-25 14:36:58 +01:00
Aurora
e23c76511d correclty implement findFreePosition and setOnGround to fix navigation wand teleport issues 2020-05-24 20:01:28 +01:00
NotMyFault
487e6c9fa3
Update README.md 2020-05-24 19:22:48 +02:00
dordsor21
c478e5d4a3
Add built jar location 2020-05-24 13:35:07 +01:00
NotMyFault
8fa493cf9f
Update IncendoPaster.java 2020-05-21 18:30:59 +02:00
NotMyFault
35c4de3484
Fixes #427 2020-05-20 11:41:36 +02:00
dordsor21
b1b591f288 PlotSquared-Core again 2020-05-20 09:49:38 +01:00
dordsor21
4e4b812fdd dum 2020-05-20 09:47:57 +01:00
dordsor21
9085365165 Override P2's /plot set 2020-05-20 09:44:59 +01:00
dordsor21
a6514f8a78 Ultimately the Striped locks will have no affect, even if kinda cool. 2020-05-20 07:58:14 +01:00
N0tMyFaultOG
ebf3cd0837 Remove duplicated translation strings 2020-05-19 14:38:53 +01:00
Orlaando
fb06c3bf39 Update SuperPickaxeCommands.java 2020-05-19 13:29:37 +01:00
NotMyFault
10ec476239
Set debug to false by default
No need to enable it unless you are actually debugging something
2020-05-18 21:50:03 +02:00
NotMyFault
5fabd15caf
Fix superpickaxe // 2020-05-18 19:39:53 +02:00
dordsor21
fd3604beba replace synchronisation with Striped access semaphore locks 2020-05-18 16:52:33 +01:00
dordsor21
31cc5e0b60 Synchronise on the nmsWorld so we're not attempting to load two chunks at the same time.
Possibly fixes #471
2020-05-18 16:04:10 +01:00
dordsor21
5be11c541b Put the synchronisation higher up the food chain 2020-05-14 22:32:32 +01:00
dordsor21
3a7c23be45 Fix #443
Temp as it's performance-degrading, but works well enough for now
2020-05-14 22:10:09 +01:00
dordsor21
35169230ad Sort of fix biome getting
It seems to want to put random blocks where the biome isn't
2020-05-14 16:27:24 +01:00
dordsor21
bdc129cf7b Update to latest p2 v5
(implement FAWE biome setting)
2020-05-14 16:20:17 +01:00
dordsor21
5225099ec0 Fix biome setting in 1.15 2020-05-14 16:17:29 +01:00