EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-23 21:56:45 +01:00
Code Issues Projects Releases Wiki Activity
2,967 Commits 232 Branches 71 Tags 86 MiB
04779d28fb
Commit Graph

487 Commits

Author SHA1 Message Date
matt
e3d43509cf Cleanup of some database methods 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-04 18:00:05 -05:00
matt
dfbcecb081 Removes Cluster Flags 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-04 12:46:27 -05:00
dordsor21
cf82bc5efb Revert 8ac9b86 2019-02-04 15:18:50 +00:00
dordsor21
14e1296e13 Only thing I can think of in 8ac9b86that would be causing the lack of plot owners (before reverting the commit) 2019-02-04 14:24:17 +00:00
dordsor21
6d6087b1e3 And don't add the Core/ code into Bukkit/ code 2019-02-04 14:02:21 +00:00
dordsor21
51afbdfcdc Apply correct codestyle 2019-02-04 13:59:11 +00:00
dordsor21
9c90928d07 Remove the debug and don't created a new BloxkBucket for every air block. 2019-02-02 16:13:55 +00:00
matt
8ac9b862f8 Major cleanup. 
Added todo comments to many 1.13 issues still lingering. Changed access to some methods to be weaker. Removed cluster flags (most of it). Java 8 stuff added. Hid more PlotSetting methods. etc.

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-01-31 14:20:48 -05:00
dordsor21
a4c3fb26c7 Check for road or unowned plot 2019-01-23 14:02:18 +00:00
dordsor21
fd4a5f2aaa Fix item despawning on plots 2019-01-23 13:34:23 +00:00
Sauilitired
8733dc6dab
Fix deny-teleport flag: Fixes #2128 2019-01-22 10:43:29 +01:00
Sauilitired
7edfc313d6
I did an oopsie 2019-01-21 12:24:34 +01:00
dordsor21
0609b3d7f6 Safer generation of the BlockBucketChunk 2019-01-19 16:28:49 +00:00
dordsor21
330ab83ece possible NPE fix and add useful debug if it fails 2019-01-17 22:34:28 +00:00
dordsor21
db2e245b13 alphabetise PlayerEvents stuff and add Turtle Eggs 2019-01-17 16:28:42 +00:00
dordsor21
f366f5e406 Remove needless generateExtBlockSections method that just reduced performance for no reason 2019-01-17 01:06:32 +00:00
dordsor21
223064567f
Plot analysis (#2239) 
* Start to fix (and may have fixed) plot analysis with block buxkets and 1.13

* Standard deviation ought also be multiplied by 100, and only obtain the BlockBucket array once

* Add schematics to Plot Analysis
Add generateBlockBucketChunk method to SingleWorldGenerator
 2019-01-17 01:04:00 +00:00
matt
0817d7de5a Removed PlotMe converting features. 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-01-15 22:19:29 -05:00
dordsor21
7e6b11a21b Fix plot swap and have a nicer static AIR block 2019-01-15 23:58:21 +00:00
dordsor21
b2d035cf69 Fix deny-exit flag causing plot kick to break 2019-01-14 17:31:22 +00:00
dordsor21
f62777bc1a Minor: 
Fix BukkitLegacyMappings method map usage
Move obtaining legacy block to default clause
Task should be async
 2019-01-12 18:05:20 +00:00
Logan Fick
8ba661aa35 Fixed plot owner UUIDs getting unnecessarily randomized. (#2233) 2019-01-12 17:48:53 +00:00
dordsor21
15ea0f3210 Fix BukkitLegacyMappings having maps the wrong way round & fix PlotBlockListFlag to use PlotBlocks. 
Fixes #2229
 2019-01-12 17:39:29 +00:00
dordsor21
3bbd97e7e1 Fix PlotDeleteEvent and PlotMergeEvent not being called. 
Replaced current PlotMergeEvent with PlotAutoMergeEvent (called when a plot is merged on /plot auto). And made PlotMergeEvent be called for /plot merge command.
 2019-01-10 17:10:25 +00:00
matt
7302480728 Merge branch 'optional' into breaking 2019-01-09 20:01:32 -05:00
Sauilitired
053edb823d
Use Incendo pasting instead of Hastebin 2019-01-09 23:12:36 +01:00
matt
c7b9bfeb4b Migrate from Guava Optionals to Java Optionals 2019-01-02 23:11:26 -05:00
dordsor21
f8ce00c2df Also cancel picking water/lava up with a bucket. 2018-12-31 18:03:59 +00:00
dordsor21
6a9038c306 Fix #2205 2018-12-31 17:57:17 +00:00
dordsor21
7bcc4c4ce3 Fix plot move/swap block rotation issue (switch to BaseBlock). Also fix container inventory pasting. 
Some cleanup.
Fixes #2209
 2018-12-31 17:15:47 +00:00
dordsor21
3156741664 Fix plot redstone disabling (not sure why it was the way it was, but it was never going to work, so I fixed? it) 
also minor reformat to PlayerEvents
 2018-12-28 17:25:29 +00:00
Sauilitired
f25581c3f1
Treat tridents as a projectile 2018-12-28 08:14:47 +01:00
Sauilitired
12b8ae3eed
Clean up some events and utility classes. Try to use as general type 
declarations as possible. Add configurable override for the unsafe block checker.
 2018-12-28 07:39:39 +01:00
Sauilitired
249b5d4068
Revert dors commit 2018-12-27 17:29:35 +01:00
matt
a529518b91 Minor changes, formatting, comments. 
One notable thing added was the inclusion of more of the new mobs in one of the events.
 2018-12-27 00:46:32 -05:00
dordsor21
fba7eac6d8 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2018-12-26 21:18:38 +00:00
dordsor21
6e127db982 Cleanup 2018-12-26 21:18:22 +00:00
Sauilitired
d12bdcfda4
Fix NPE on VehicleMoveEvent. Fixes #2195. 2018-12-26 19:25:20 +01:00
Sauilitired
f1cf541606
Merge remote-tracking branch 'origin/breaking' into breaking 2018-12-26 19:16:42 +01:00
Sauilitired
2b9fe5afda
Fix plot music (and plot inventories) 2018-12-26 19:16:34 +01:00
dordsor21
ba47a21971 - Update code style to format annotations nicely 
- Reformat code
 2018-12-26 17:21:06 +00:00
Sauilitired
5bdc5a0fcc
Fix road schematics but for real this time 2018-12-26 17:24:35 +01:00
Sauilitired
2ebb7d11a8
Fix road schematics 2018-12-26 17:05:37 +01:00
Sauilitired
1d08f4d4ff
Include a rationale like Spottedleaf was kind enough to suggest 2018-12-26 15:38:31 +01:00
Sauilitired
b05316c000
Recommend paper just like FAWE. I want to be like the cool kids. 
Oh, and fix an issue with `/plot music`. Still broken. Just not
the same kind of broken.
 2018-12-26 15:29:39 +01:00
Sauilitired
afb0a9f17f
Forcefully load WorldEdit on startup 2018-12-25 12:05:01 +01:00
dordsor21
af23d3d98e Fix schematic pasting to paste tile entities and blocks with BlockData (e.g. stairs) properly 2018-12-24 17:56:13 +00:00
dordsor21
1bf621fb4b Fix schematic saving (and improve performance slightly) 2018-12-23 22:49:43 +00:00
Sauilitired
02937cc543
Add configuration conversion and fix BukkitLegacyMappings 2018-12-23 19:43:36 +01:00
Sauilitired
165cac8b13
Fix bStats problem and commit Setup progress 2018-12-23 17:38:27 +01:00
MattBDev
c1fa6c842d Removing old Metrics class 
We don't need any fancy metrics at the moment. They can be added later if needed.
 2018-12-21 23:38:01 -05:00
sauilitired
23b9eca4ab Add bStats support, seeing as mcstats has been down for ages 2018-12-21 21:10:37 +01:00
sauilitired
dff64c5c68 Add support for 1.13 blocks 2018-12-21 17:49:04 +01:00
dordsor21
8bc0bcd9e6 Update BukkitUtil#isBlockSolid to 1.13 2018-12-21 01:04:37 +00:00
dordsor21
28f3be56b3 Fix schematic creation 
Seems fairly ugly, but only because the format requires the blocks be inputted in that exact order, and it prevents us from having to cache the blocks per chunk to then insert into the relevant tags.
 2018-12-21 00:49:15 +00:00
dordsor21
90682e9f8b Various: 
- Some minor cleanup
 - Test for null id, not for null PlotBlock
 - Small fixes to schematic saving (still broken)
 2018-12-20 23:33:24 +00:00
dordsor21
1021c6f2b0 Use Math.min and Math.max 2018-12-20 20:25:21 +00:00
dordsor21
780d3d7703 *Don't set the the cuboid block by block if we've already technically done that 2018-12-20 20:23:11 +00:00
dordsor21
6ac7948f72 Pretty basic fix for chunk generation 2018-12-20 20:20:31 +00:00
dordsor21
4e10682748 A few minor fixes 2018-12-20 18:46:52 +00:00
dordsor21
1543ac50cd Various: 
- Empty StringPlotBlocks are air
 - Update signs to 1.13
 - Fix getting material in BukktiLocalQueue#setMaterial
 2018-12-20 17:20:13 +00:00
dordsor21
442473368d This slipped through 2018-12-20 12:26:51 +00:00
dordsor21
b35221bf4f Fix crashing on chunk load (chunks are still empty though) 2018-12-20 12:23:49 +00:00
sauilitired
568b4c8e85 Merge remote-tracking branch 'origin/breaking' into breaking 
# Conflicts:
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
 2018-12-20 02:25:55 +01:00
sauilitired
e939b8237e Changelist: 
- Added aliases for custom configuration types
- Removed numerical ID based methods in Block Queues
- Fixed sign removal in Plot.java
- (Hopefully) fixed dividing by 0 errors in BlockBucket
- Removed random from some methods, as blockbucket has it's own random
- Temporarily removed chunk analysis
- Changed a lot in GenChunk and BukkitPlotGenerator
 2018-12-20 02:23:48 +01:00
dordsor21
5aac7d07d2 Remove abstraction of BukkitSchematicHandler 2018-12-20 00:47:04 +00:00
dordsor21
ee6d52efa3 Update all legacy IDs 2018-12-20 00:43:47 +00:00
dordsor21
adc2d980f4 Clean up listeners for legacy versions 2018-12-19 23:49:35 +00:00
dordsor21
11ccfe7ac4 Reformat code 2018-12-19 23:26:20 +00:00
dordsor21
fa2dbb2b89 Update to WorldEdit 7 (and WE7-compatible schematics, *hopefully keeping legacy*) 2018-12-19 23:18:57 +00:00
dordsor21
e7b25d3fc8 Update BukkitLocalQueue to new LegacyMappings 2018-12-19 18:46:30 +00:00
sauilitired
444222c7f9 Improve PlotBlock name matching 2018-12-19 18:36:50 +01:00
sauilitired
e724aa8caf Fix PlotItem. 2018-12-19 18:24:35 +01:00
sauilitired
8f23299e7d Use BlockBuckets everywhere. 2018-12-19 17:19:54 +01:00
dordsor21
361cc9e9f7 Remove old LegacyMappings class from Bukkit 
Add "fromAny" method
 2018-12-19 15:08:49 +00:00
dordsor21
531d8cc706
Merge branch 'breaking' into breaking 2018-12-19 14:54:32 +00:00
dordsor21
4b02bb1df8 Refactor legacy mappings to use PlotBlocks 2018-12-19 14:52:15 +00:00
sauilitired
ccad0bced9 Progress. 2018-12-18 20:54:20 +01:00
sauilitired
fb7bcef05f 1.13 shizzle 2018-12-17 20:57:21 +01:00
sauilitired
152e9e0e90 Make it build. 2018-12-06 16:59:10 +01:00
sauilitired
4395ca06b4 Add @SuppressWarnings("unused") to listeners. 2018-11-15 00:12:12 +01:00
sauilitired
06f64aeff0 Extract duplicated method declaration 2018-11-15 00:06:20 +01:00
sauilitired
a8b4729845 Rename DBFunc#everyone to DBFunc#EVERYONE, and create two string constants 🐱 2018-11-14 23:51:56 +01:00
dordsor21
8cd54929e7 Merge branch 'master' into breaking 
# Conflicts:
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/C.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java
#	Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
#	Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java
#	README.md
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java
 2018-11-14 14:44:07 +00:00
sauilitired
8df7f63931 Refactor PS (and rename to PlotSquared) 2018-11-14 14:19:57 +01:00
dordsor21
ea5ffbeb77 Cancel plot chat if message event is cancelled to allow for swear block/etc 2018-10-25 10:51:18 +01:00
dordsor21
9e9b21779c Add PlotChangeOwner Event 2018-09-19 16:57:33 +01:00
sauilitired
032484b0f5 Pull out duplicated method sub in BukkitPlayer 2018-08-20 12:15:03 +02:00
sauilitired
e98c648244 Move PlotAPI to Core and move bukkit specific methods to BukkitUtil. 2018-08-20 11:35:41 +02:00
sauilitired
be9fb3bd3a Remove deprecated methods without internal use. 2018-08-20 11:05:00 +02:00
sauilitired
01a927ccad Allow PlotRateEvent to be cancelled. Fixes #2017 2018-08-19 23:12:59 +02:00
sauilitired
3c86531b58 * ;) 2018-08-19 22:21:42 +02:00
sauilitired
847ce7f20d (W.I.P) TeleportEntityWrapper as alternative to replicating entity wrapper 2018-08-19 22:18:58 +02:00
sauilitired
369ccb7c8d Prettify BukkitUtil 2018-08-10 20:54:17 +02:00
sauilitired
724fb34b1f Prettify BukkitMain 2018-08-10 20:46:38 +02:00
sauilitired
2898e9ae2b Fix error from refactoring 2018-08-10 20:30:05 +02:00
sauilitired
b0348cfc34 Update packages. This will not be appreciated 🐱 2018-08-10 17:53:15 +02:00
sauilitired
1646cd0f5a Reformat code 2018-08-10 17:01:11 +02:00
Speentie8081
be8172ce91 Assume spigot 1.13 if NumberFormatException is fired 2018-07-22 09:17:38 -05:00
Speentie8081
768e21d1b5 Update NBTFactory to support spigot 1.13 2018-07-22 09:09:39 -05:00