SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

even even even more work

Browse Source
This commit is contained in:
MiniDigger | Martin
2020-06-25 16:09:55 +02:00
parent 4aa7955818
commit e943ece469
125 changed files with 857 additions and 3512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Spigot-Server-Patches/Hook-into-CB-plugin-rewrites.patch
View File

@@ -7,19 +7,6 @@ Allows us to do fun stuff like rewrite the OBC util fastutil location to
our own relocation. Also lets us rewrite NMS calls for when we're
debugging in an IDE pre-relocate.
diff --git a/pom.xml b/pom.xml
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>7.3.1</version>
+ <version>8.0.1</version> <!-- Paper -->
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
@@ -94,11 +81,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
{
OptionParser parser = new OptionParser();
@@ -0,0 +0,0 @@ public class Commodore
ClassReader cr = new ClassReader( b );
ClassWriter cw = new ClassWriter( cr, 0 );
- cr.accept( new ClassVisitor( Opcodes.ASM7, cw )
+ cr.accept( new ClassVisitor( Opcodes.ASM8, cw) // Paper
cr.accept( new ClassVisitor( Opcodes.ASM8, cw )
{
+ // Paper start - Rewrite plugins
+ @Override
@@ -160,8 +144,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ super.visitFrame( type, nLocal, local, nStack, stack );
+ }
+
+
+
+ @Override
+ public void visitLocalVariable(String name, String descriptor, String signature, Label start, Label end, int index)
+ {
@@ -170,8 +152,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ super.visitLocalVariable( name, descriptor, signature, start, end, index );
+ }
+ // Paper end
+
+
@Override
public void visitFieldInsn(int opcode, String owner, String name, String desc)
@@ -184,9 +164,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }
+ // Paper end
+
if ( modern )
if ( owner.equals( "org/bukkit/block/Biome" ) )
{
if ( owner.equals( "org/bukkit/Material" ) )
switch ( name )
@@ -0,0 +0,0 @@ public class Commodore
return;
}