Commit Graph

434 Commits

Author SHA1 Message Date
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
Speentie8081
bbee2debff Remove unneeded changes and add back support for 1.9 through 1.12 2018-07-21 10:32:38 -05:00
Speentie8081
d5b01aced2 Use MaterialData instead of block id and data for chunk generation 2018-07-21 00:15:13 -05:00
Speentie8081
f533efb2c8 Add support for spigot 1.13-pre7 2018-07-20 23:51:09 -05:00
Josh
d673537026
fix dispensers
previously dispensers were not working at all, this change blocks lava and water and allows dispensers to function normally again on servers with plotsquared. if you were trying to block dispensers launching items into the road however that still is not blocked by this
2018-07-20 19:23:39 -04:00
Jesse Boyd
5d04c64d48
Fix typo 2018-07-07 09:11:23 +10:00
Jesse Boyd
185fe39942
Fix check for UUID support 2018-07-07 08:50:43 +10:00
Jesse Boyd
79e1ea9a8f
* 2018-06-23 14:13:06 +10:00
Jesse Boyd
1772fdab16
Fixes #1988 2018-06-23 14:12:21 +10:00
Jesse Boyd
9020d740d1
Revert "possible fix for mob damage"
This reverts commit df6914fb1e.
2018-06-23 11:46:19 +10:00
Jesse Boyd
df6914fb1e
possible fix for mob damage 2018-06-21 07:48:45 +10:00
Jesse Boyd
3039331976
Add account age expiry filter 2018-06-19 03:29:14 +10:00
Jesse Boyd
37b0cdeace
Revert "Don't cancel chat event"
This reverts commit dc5fc5af47.
2018-06-10 19:35:34 +10:00
Jesse Boyd
dc5fc5af47
Don't cancel chat event 2018-06-09 05:45:25 +10:00
Jesse Boyd
442513b592
Fixes #1970 2018-06-07 08:15:28 +10:00
Jesse Boyd
40635255e3
Probably fixes #1953 2018-05-18 14:48:17 +10:00
Jesse Boyd
550df7f232
Fixes #1952 2018-05-17 17:46:54 +10:00
Jesse Boyd
d6c472fcdf
Fixes #1484 2018-05-17 16:23:27 +10:00
Jesse Boyd
a83b51eb12
Fixes #1951 2018-05-17 15:21:53 +10:00
Jesse Boyd
f479a70594
Fixes #1729 2018-05-17 15:11:44 +10:00
Jesse Boyd
9f9527d2e2
Fixes #1784 2018-05-17 14:53:34 +10:00
Jesse Boyd
98b7a84119
Fixes #1483 2018-05-17 14:50:47 +10:00
Jesse Boyd
5cb94f3e45
Fixes #1928 2018-05-17 14:43:51 +10:00
Jesse Boyd
59e06c2319
Fixes #1929 2018-05-07 10:44:16 +10:00
Jesse Boyd
ef54775ca7
wtf, this has its own spawn reason, thanks spigot
Fixes #1803
2018-05-07 10:15:21 +10:00
Jesse Boyd
ef83b5a1b7
Fixes #1931 2018-04-28 09:28:55 +10:00
Jesse Boyd
9fe1e53d9d
Fix single generator biomes 2018-04-15 10:47:00 +10:00
Jesse Boyd
7f257e2bf3
* 2018-04-12 00:20:13 +10:00
Jesse Boyd
c5b332246e
Fix setblock npe 1.8 2018-04-11 23:41:09 +10:00
Jesse Boyd
3565e67137
Prevent entity portal use from plotworld 2018-03-18 09:28:23 +11:00
Jesse Boyd
b36d42811a
Fixes #1897 2018-03-12 17:26:40 +11:00
Jesse Boyd
c5d5b52df4
Tweak item drop check 2018-02-08 19:42:36 +11:00
Jesse Boyd
4b50276ba0
Fixes #1844 2018-01-31 13:05:11 +11:00
Jesse Boyd
8815c83ba1
Various minor
Teleport on login fixes
World unloading fixes
2018-01-27 16:26:09 +11:00
Jesse Boyd
bc8b2af164
Fixes #1774 (backwards compatibility) 2018-01-10 17:06:35 +11:00
Christian Langel
7d39d09317 fix: remove plot-alias with "/p alias" (#1779)
* fix: remove plot-alias with "/p alias"

remove plot-alias with "/p alias" #1718

* Apply requested Review Changes

Restored the original Permisson to keep backwards compatibility
Clean unused imports.

* added some improvements after testing

added some improvements after testing
2017-12-03 17:59:36 +01:00
Christian Langel
3779b17720 fix: shulker-teleport in a other plot (#1774)
- shulker-teleport in a other plot (Fixes #1762)
 - dropper can't drop lava_bucket and water_bucket  (Fixes #1775)
2017-12-03 17:21:15 +01:00
Jesse Boyd
734c4bb5fe
Fix vehicle deletion 2017-11-14 17:24:02 +11:00
Jesse Boyd
6b7adcdf34
Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2017-11-14 17:10:05 +11:00
Jesse Boyd
a752780eeb
Minor fixes
Update message color
CME on plot action
Creative middle click banner/head
2017-11-14 17:09:51 +11:00
Opachl
c281620d75
Update PlayerEvents.java
added missing import
2017-11-12 17:49:14 +01:00
Opachl
c3f93a1960 fix: Interaction flag with item_frame
Interaction flag with item_frame #1761
2017-11-12 17:36:58 +01:00
Opachl
b4e8d782a1 Revert "fix: nteraction flag with item_frame"
This reverts commit a2eb727e25.
2017-11-12 17:35:59 +01:00
Opachl
a2eb727e25 fix: nteraction flag with item_frame
nteraction flag with item_frame #1761
2017-11-12 17:34:50 +01:00
Jesse Boyd
6e841543b8
Closes #1731 2017-11-09 10:57:17 +11:00
Jesse Boyd
534d627b05
Fixes #1732 2017-11-09 10:18:52 +11:00
Jesse Boyd
37f1da0715
Various minor
VehicleMoveEvent
- Move KillRoadVehicles code there
- Fix for pre-1.12
Fix auto merge being disabled
2017-11-09 10:15:16 +11:00
Alexander Söderberg
530803c738 Implement VehicleMoveEvent for Bukkit. This fixes #1754. It also makes sure that you cannot use
vehicles to enter plots that you're denied from.
2017-11-06 22:01:18 +01:00
Jesse Boyd
5b6d5664e4
Fix fireworks being spawnable in other plots 2017-11-03 06:58:57 +11:00
Jesse Boyd
0d608245f5
Some tweaks / optimizations 2017-09-25 16:57:42 +10:00
Jesse Boyd
92f94ecedc
Tweaks
Use sign with plot schematic
Tweak world unloading
2017-09-24 00:13:05 +10:00
Jesse Boyd
abfbeffbb0
Skip y=255, block when finding a free spot 2017-09-23 15:09:03 +10:00
Jesse Boyd
31908090b8
Buld height check 2017-09-23 14:07:52 +10:00
Jesse Boyd
d97ff94465
Various minor
Fix download world spawnpoint
Fix regenallroads on augmented world
Ensure all chunks have unloaded before unloading a world
2017-09-20 00:33:29 +10:00
Jesse Boyd
24b3b60983
Might fix #1704 2017-09-01 23:11:37 +10:00
Jesse Boyd
538e2a6002
Varios
Fixes #1697
Fixes #1689
2017-08-18 12:37:26 +10:00
Jesse Boyd
da51be20a3
Fix compile 2017-08-10 16:55:57 +10:00
Jesse Boyd
c3759f8963
Fixes #1672 2017-08-10 16:46:51 +10:00
Jesse Boyd
c36ef1d237
Fixes #1673
+ unrelated plotme conversion fix
2017-08-10 16:35:53 +10:00
Jesse Boyd
cc1324f581
Fixes #1682 2017-08-09 15:45:27 +10:00
Jesse Boyd
b924809c91
Fixes #1608 2017-08-03 23:13:04 +10:00
Jesse Boyd
355e16fe92
Ignore searching top block for teleportation 2017-06-09 17:43:46 +10:00