mirror of
				https://github.com/mcMMO-Dev/mcMMO.git
				synced 2025-11-04 02:53:43 +01:00 
			
		
		
		
	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO
This commit is contained in:
		@@ -7,7 +7,7 @@ Key:
 | 
				
			|||||||
  ! Change
 | 
					  ! Change
 | 
				
			||||||
  - Removal
 | 
					  - Removal
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
Version 1.3.03-dev
 | 
					Version 1.3.03
 | 
				
			||||||
 + Added Ocelots to Taming XP tables
 | 
					 + Added Ocelots to Taming XP tables
 | 
				
			||||||
 + Added ability to summon Ocelots with Call of the Wild
 | 
					 + Added ability to summon Ocelots with Call of the Wild
 | 
				
			||||||
 + Added offline user functionality to mmoedit
 | 
					 + Added offline user functionality to mmoedit
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pom.xml
									
									
									
									
									
								
							@@ -2,7 +2,7 @@
 | 
				
			|||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					    <modelVersion>4.0.0</modelVersion>
 | 
				
			||||||
    <groupId>com.gmail.nossr50.mcMMO</groupId>
 | 
					    <groupId>com.gmail.nossr50.mcMMO</groupId>
 | 
				
			||||||
    <artifactId>mcMMO</artifactId>
 | 
					    <artifactId>mcMMO</artifactId>
 | 
				
			||||||
    <version>1.3.03-dev</version>
 | 
					    <version>1.3.03</version>
 | 
				
			||||||
    <name>mcMMO</name>
 | 
					    <name>mcMMO</name>
 | 
				
			||||||
    <url>https://github.com/mcMMO-Dev/mcMMO</url>
 | 
					    <url>https://github.com/mcMMO-Dev/mcMMO</url>
 | 
				
			||||||
    <issueManagement>
 | 
					    <issueManagement>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -266,7 +266,7 @@ public class WoodCutting {
 | 
				
			|||||||
        int xp = 0;
 | 
					        int xp = 0;
 | 
				
			||||||
        TreeSpecies species = TreeSpecies.getByData(block.getData());
 | 
					        TreeSpecies species = TreeSpecies.getByData(block.getData());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (block.hasMetadata("mcmmpPlacedBlock")) {
 | 
					        if (block.hasMetadata("mcmmoPlacedBlock")) {
 | 
				
			||||||
            return;
 | 
					            return;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user