Josh Roy
cfb17666ff
even MOAR progress
2021-06-14 06:45:16 -07:00
Aurora
42091ba5f0
Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17
2021-06-14 14:04:57 +02:00
Aurora
8ca5a642ef
more work work work
2021-06-14 14:04:35 +02:00
Jason Penilla
b7cdb5d6c4
fix issue in hopper patch
2021-06-14 03:18:42 -07:00
Aurora
d2cb88db9c
Merge branch 'dev/1.17' of github.com:PaperMC/Paper into dev/1.17
2021-06-14 12:13:18 +02:00
Aurora
ba3ce754a9
more work uwu
2021-06-14 12:13:08 +02:00
Jason Penilla
eddf0f40dc
decomp fixes
2021-06-14 02:15:37 -07:00
Jason Penilla
f7bc641230
Add missing getLevel implementation to Hopper Minecart, add mapping to fix reobf
2021-06-14 02:06:46 -07:00
Jake Potrebic
7fe98bd520
more patches ( #5827 )
...
* more patches
* even moar patches
2021-06-14 10:37:14 +02:00
Jake Potrebic
405ab6388e
add entity debug info patch back
2021-06-14 09:38:41 +02:00
Jake Potrebic
4b2f4cbebb
Add back incremental chunk saving patch
2021-06-14 09:30:41 +02:00
Jason Penilla
45c6df9648
patches
2021-06-13 23:45:29 -07:00
Jason Penilla
ba374d2485
reorder
2021-06-13 22:42:29 -07:00
mechoriet
dcbb16316d
ReAdded PreCreatureSpawnEvent from removed ( #5814 )
2021-06-13 22:40:21 -07:00
Jake Potrebic
9c95d0481d
Re-add xp orb merging patches ( #5823 )
2021-06-13 22:37:57 -07:00
Jason Penilla
3c02c90f3e
progress
2021-06-13 22:32:56 -07:00
Jason Penilla
d001eefd7e
2 patch
2021-06-13 21:29:40 -07:00
Omer Uddin
961f297963
fix exception ( #5822 )
2021-06-13 21:29:25 -07:00
Jason Penilla
5e62aca6c9
small fixes
2021-06-13 20:06:11 -07:00
Jason Penilla
3d7b0490c0
reorder patches after merge
2021-06-13 19:43:29 -07:00
Jason Penilla
f67dc7a35b
patches
2021-06-13 19:42:02 -07:00
Omer Uddin
3e552cc54c
work work ( #5821 )
2021-06-13 19:41:44 -07:00
Jason Penilla
6c30949610
Use correct jetbrains annotations
2021-06-13 18:48:31 -07:00
Jake Potrebic
2a46c72164
EVEN MOOOOOAAAAAAARRRRRRR patches :) ( #5820 )
2021-06-13 18:06:38 -07:00
MiniDigger
9085da6e60
fix tests
2021-06-14 02:19:51 +02:00
MiniDigger
b75a22c4b1
not even checkstyle can help us now
2021-06-14 01:48:04 +02:00
MiniDigger
2372198eb4
use local class for movecontrol stuff to prevent reobf mapping issue
2021-06-14 01:19:51 +02:00
Jake Potrebic
f55b6e04b1
MOAR PATCHES
2021-06-14 00:06:46 +02:00
Jake Potrebic
27a8d6da9a
more patches
2021-06-13 21:31:39 +02:00
MiniDigger
123a41d132
adjust material set tag sizes
...
MC added a buuuunch of stuff
2021-06-13 20:34:25 +02:00
Professor Bloodstone
7f15d7832f
Fix recursive connection call causing StackOverflowException
...
This was probably caused by the rename sendPacket->send and dispatchPacket->sendPacket
2021-06-13 19:24:06 +02:00
Aurora
8af12b17c1
even more work
2021-06-13 17:17:44 +02:00
Aurora
b804730254
more work
2021-06-13 15:46:28 +02:00
KennyTV
fd645b456c
Fix compile
2021-06-13 14:54:37 +02:00
KennyTV
2bf9070a52
Move this back
2021-06-13 14:44:31 +02:00
KennyTV
5d9882a976
More more work
2021-06-13 14:43:56 +02:00
KennyTV
19da14ee00
More work
2021-06-13 14:14:18 +02:00
KennyTV
d42140148f
Work
2021-06-13 13:05:43 +02:00
Jason Penilla
76a75fc35a
fix compile
2021-06-13 01:47:24 -07:00
Jason Penilla
b8b3c40023
patch
2021-06-13 01:40:50 -07:00
Jason Penilla
41a5f14f9e
patches and patches
2021-06-13 01:27:20 -07:00
Jason Penilla
79f1d1a078
patches
...
fix
2021-06-12 23:53:47 -07:00
Jason Penilla
0fa2a949ae
Updated Upstream (Bukkit/CraftBukkit/Spigot)
...
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
8503c3c9 #621 : Add HumanEntity#getItemInUse and Material#getSlipperiness
248deb09 #622 : Add methods to check if item is the breed item for an entity
2ce691d8 Clarify Player#breakBlock only works for blocks in the same world
5dcdd48e SPIGOT-6514: Small Dripleaf block data is missing half property
cc9610b7 #619 : Add Player#breakBlock()
862bc475 Fix bad merge of SPIGOT-6502 fix
989bb0c1 Downgrade SnakeYAML due to issues with comments parsing
1dff62ae Fix inverted visual fire docs
CraftBukkit Changes:
40caacc8 SPIGOT-6526: World entities are not populated when plugin onEnable is called
c9a92ad0 SPIGOT-6536: Marker position not set on spawn
20d3e57c #855 : Add HumanEntity#getItemInUse and Material#getSlipperiness
d9c69b44 SPIGOT-6529: Fix BundleMeta#setItems
8bd43be5 SPIGOT-6535: PlayerGameModeChangeEvent event incorrectly reports old gamemode
4ece3ff3 #856 : Add methods to check if item is the breed item for an entity
dd4bec5f Add additional validation to Player#breakBlock
bc835ae6 SPIGOT-6532: Fix Entity#setGlowing
384e116e Restore 1.16.5 behaviour of InventoryDragEvent being called even when a single item is 'dragged' to its own slot
b42e708c Fix new map colors rendering as transparent
cfe7fecf SPIGOT-6524: Inventory desync when InventoryClickEvent is cancelled
eeae1b19 SPIGOT-6522: ItemStack on cursor is always AIR
7490724d Fix missing PlayerEditBookEvent
06875f76 SPIGOT-6513: Placing ItemStack in Inventory causes InventoryAction.NOTHING
27835bde SPIGOT-6519: Fix end gateway teleports
4ac634ad SPIGOT-6515: "Un-waterlogging" throws UnsupportedOperationException in some cases
da425fa2 SPIGOT-6518: Anvils falling onto dripstone can sometimes crash server
50530da9 SPIGOT-6514: Small Dripleaf block data is missing half property
6fdecf20 #853 : Implement Player#breakBlock()
4db9c49f SPIGOT-6510: Bukkit#createMap throws NullPointerException
89e2b127 SPIGOT-6517: Spider jockey crash on dripstone
cbf2f678 SPIGOT-6508: Rename conflicted getServer
74575d48 SPIGOT-6506: Fix crash with custom inventories
a3df386f Fix NPE with Entity.getNearbyEntities
d747f8ed Fix NPE with World.getNearbyEntities
4d2c7800 Fix second usage of worldGenSettings just in case
5182f923 SPIGOT-6504: Fix generating fresh worlds
Spigot Changes:
66f9d3c1 Rebuild patches
191e4971 Rebuild patches
a09c0bb6 Restore Spigot experience merging
2021-06-12 22:13:07 -07:00
Jason Penilla
52f28953be
patches
2021-06-12 22:09:48 -07:00
Jason Penilla
5e9c53b5b7
Merge remote-tracking branch 'leaf/dev/1.17' into dev/1.17
2021-06-12 21:35:43 -07:00
Spottedleaf
cef692bcc6
wor
2021-06-12 21:25:07 -07:00
Spottedleaf
ca621e6280
even even even even more work
2021-06-12 21:03:02 -07:00
Jason Penilla
2a3f1fa30c
Resolve run working directory from rootProject
2021-06-12 20:35:03 -07:00
Jason Penilla
06f41a4885
Use forUseAtConfigurationTime() for run directory property
2021-06-12 20:21:59 -07:00
Jason Penilla
24e9620d14
Use mergeServiceFiles() instead of AppendingTransformer
2021-06-12 19:23:21 -07:00
Jason Penilla
75b99eb454
Add runWorkDir property for setting a custom run task working directory
2021-06-12 19:18:24 -07:00
Spottedleaf
cc19211cf9
wowe
2021-06-12 19:16:10 -07:00
Jason Penilla
672c5365f4
Write API version to pom.properties for Versioning to read
...
Maven writes this metadata normally, but we don't use maven. Maybe should modify Versioning instead in the future, but this works just fine for now.
2021-06-12 18:28:41 -07:00
Jake Potrebic
2ba2c29b2e
more patches ( #5811 )
2021-06-13 00:45:00 +01:00
Jake Potrebic
a968aefd32
more patches
2021-06-12 23:32:23 +02:00
Jake Potrebic
716a3139b7
more patches ( #5808 )
2021-06-12 20:30:37 +01:00
MiniDigger
116a6013c3
Fix this stupid bullshit v2
2021-06-12 19:13:23 +02:00
Jake Potrebic
2397b86efa
more patches ( #5807 )
2021-06-12 17:56:13 +01:00
Aurora
79da8f0eca
even more wooooooooooooooooooooooooork uwu
2021-06-12 17:06:20 +02:00
KennyTV
8125b3f1be
More more more work
2021-06-12 14:58:17 +02:00
KennyTV
88bc74ec42
Fix patch, fix .gitattributes file name
2021-06-12 14:09:11 +02:00
KennyTV
3c1cd3bdf2
More more work
2021-06-12 13:54:46 +02:00
KennyTV
0ec8b900ba
More work
2021-06-12 12:26:21 +02:00
Spottedleaf
d9210c3ee7
even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even
...
more work
2021-06-12 11:22:46 +02:00
Spottedleaf
1753b33104
even even even even even even even even even even even
...
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
even even even even even even even even even even
more work
2021-06-12 11:22:46 +02:00
MiniDigger
864ef24fc0
fix profile cache mappings
...
let me be OP god dammit!
2021-06-12 09:30:37 +02:00
Spottedleaf
b1517fe9f2
even even even even even even even even even more changes
2021-06-12 09:26:16 +02:00
Spottedleaf
9da160169a
even even even even even even even more work
2021-06-12 09:26:16 +02:00
Spottedleaf
42458fbca4
even even more progress
2021-06-12 09:26:16 +02:00
Spottedleaf
8599f95b4f
even more progress
2021-06-12 09:26:16 +02:00
Spottedleaf
2920f9b9e5
some patches
2021-06-12 09:26:16 +02:00
Jake Potrebic
2dc0a31f5c
fix PlayerUseUnknownEntityEvent patch ( #5800 )
2021-06-12 04:37:02 +01:00
Jason Penilla
d43c31d141
patches
2021-06-11 20:07:57 -07:00
Jason Penilla
c56800c6fb
Add ASM dep to API and fix issues from title packet changes with bungee api
2021-06-11 19:25:10 -07:00
Jake Potrebic
933a189a04
more patches ( #5799 )
2021-06-12 03:24:43 +01:00
Jake Potrebic
650edb93ca
more patches
2021-06-12 03:19:04 +02:00
Jake Potrebic
3a3831d6aa
more patches
2021-06-12 03:19:04 +02:00
Jake Potrebic
1f8e76b185
rebase
2021-06-12 03:19:04 +02:00
Jake Potrebic
a9f38a8789
fix adventure patch
2021-06-12 03:19:04 +02:00
Jason Penilla
9188180d7a
Add Paper version back to manifest, add runShadow, runReobf, and runDev tasks for testing
2021-06-11 18:10:12 -07:00
MiniDigger
a22a0e56ef
few fixes to make it actually run
2021-06-12 02:22:53 +02:00
Mariell Hoversholm
a79616b9cc
fix: the server compiles
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:33:36 +02:00
Mariell Hoversholm
088e980a80
fix: closer to compilable
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:26:56 +02:00
Mariell Hoversholm
9c2a18af92
fix: remove #isStopping check
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:16:11 +02:00
Mariell Hoversholm
d8d7c8c8aa
fix: remove empty java file
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:08:26 +02:00
Mariell Hoversholm
87ee3b4d67
fix: add pom changes to gradle
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 20:06:01 +02:00
Jake Potrebic
3f10bf1163
Update Timings patch ( #5796 )
2021-06-11 20:02:16 +02:00
Mariell Hoversholm
132382dca3
More remapped patches
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 17:52:05 +02:00
Mariell Hoversholm
a207d14a0e
Rename all patches to correct numbering scheme
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 15:46:44 +02:00
Mariell Hoversholm
35487dbfcc
Apply a few more patches
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 15:46:25 +02:00
Mariell Hoversholm
648fec34e4
Rename POM changes to build system changes
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 14:33:08 +02:00
Mariell Hoversholm
1eedd5991a
Remap POM changes patch
...
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
2021-06-11 14:31:17 +02:00
MiniDigger
4d225813a1
Move patches around
2021-06-11 14:02:28 +02:00
